tony2001 Tue Aug 19 15:14:16 2008 UTC Modified files: /php-src/ext/standard basic_functions.c crypt.c php_crypt.h Log: shudown crypt correctly and fix memleak in ZTS mode http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.921&r2=1.922&diff_format=u Index: php-src/ext/standard/basic_functions.c diff -u php-src/ext/standard/basic_functions.c:1.921 php-src/ext/standard/basic_functions.c:1.922 --- php-src/ext/standard/basic_functions.c:1.921 Mon Aug 18 10:40:05 2008 +++ php-src/ext/standard/basic_functions.c Tue Aug 19 15:14:15 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: basic_functions.c,v 1.921 2008/08/18 10:40:05 jani Exp $ */ +/* $Id: basic_functions.c,v 1.922 2008/08/19 15:14:15 tony2001 Exp $ */ #include "php.h" #include "php_streams.h" @@ -4105,7 +4105,6 @@ basic_globals_dtor(&basic_globals TSRMLS_CC); #ifdef PHP_WIN32 php_win32_core_globals_dtor(&the_php_win32_core_globals TSRMLS_CC); - PHP_MSHUTDOWN(crypt); #endif #endif @@ -4126,6 +4125,7 @@ #if defined(HAVE_LOCALECONV) && defined(ZTS) PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU); #endif + PHP_MSHUTDOWN(crypt)(SHUTDOWN_FUNC_ARGS_PASSTHRU); return SUCCESS; } http://cvs.php.net/viewvc.cgi/php-src/ext/standard/crypt.c?r1=1.74&r2=1.75&diff_format=u Index: php-src/ext/standard/crypt.c diff -u php-src/ext/standard/crypt.c:1.74 php-src/ext/standard/crypt.c:1.75 --- php-src/ext/standard/crypt.c:1.74 Mon Jul 28 11:34:53 2008 +++ php-src/ext/standard/crypt.c Tue Aug 19 15:14:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: crypt.c,v 1.74 2008/07/28 11:34:53 pajoye Exp $ */ +/* $Id: crypt.c,v 1.75 2008/08/19 15:14:15 tony2001 Exp $ */ #include <stdlib.h> @@ -108,15 +108,16 @@ return SUCCESS; } +/* }}} */ -#ifdef PHP_USE_PHP_CRYPT_R -PHP_MSHUTDOWN_FUNCTION(crypt) +PHP_MSHUTDOWN_FUNCTION(crypt) /* {{{ */ { +#ifdef PHP_USE_PHP_CRYPT_R php_shutdown_crypt_r(); +#endif return SUCCESS; } -#endif /* }}} */ static unsigned char itoa64[] = "./0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz"; http://cvs.php.net/viewvc.cgi/php-src/ext/standard/php_crypt.h?r1=1.21&r2=1.22&diff_format=u Index: php-src/ext/standard/php_crypt.h diff -u php-src/ext/standard/php_crypt.h:1.21 php-src/ext/standard/php_crypt.h:1.22 --- php-src/ext/standard/php_crypt.h:1.21 Mon Dec 31 07:12:16 2007 +++ php-src/ext/standard/php_crypt.h Tue Aug 19 15:14:15 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_crypt.h,v 1.21 2007/12/31 07:12:16 sebastian Exp $ */ +/* $Id: php_crypt.h,v 1.22 2008/08/19 15:14:15 tony2001 Exp $ */ #ifndef PHP_CRYPT_H #define PHP_CRYPT_H @@ -26,6 +26,7 @@ PHP_FUNCTION(crypt); #if HAVE_CRYPT PHP_MINIT_FUNCTION(crypt); +PHP_MSHUTDOWN_FUNCTION(crypt); PHP_RINIT_FUNCTION(crypt); #endif
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php