tony2001 Tue Aug 19 15:14:46 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/standard basic_functions.c crypt.c php_crypt.h
Log:
MFH: shutdown crypt correctly and fix memleak in ZTS mode
http://cvs.php.net/viewvc.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.31.2.64.2.55&r2=1.725.2.31.2.64.2.56&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.55
php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.56
--- php-src/ext/standard/basic_functions.c:1.725.2.31.2.64.2.55 Mon Aug 18
10:49:59 2008
+++ php-src/ext/standard/basic_functions.c Tue Aug 19 15:14:46 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.55 2008/08/18 10:49:59 jani Exp
$ */
+/* $Id: basic_functions.c,v 1.725.2.31.2.64.2.56 2008/08/19 15:14:46 tony2001
Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -4108,7 +4108,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
@@ -4129,6 +4128,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.62.2.1.2.6.2.3&r2=1.62.2.1.2.6.2.4&diff_format=u
Index: php-src/ext/standard/crypt.c
diff -u php-src/ext/standard/crypt.c:1.62.2.1.2.6.2.3
php-src/ext/standard/crypt.c:1.62.2.1.2.6.2.4
--- php-src/ext/standard/crypt.c:1.62.2.1.2.6.2.3 Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/crypt.c Tue Aug 19 15:14:46 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: crypt.c,v 1.62.2.1.2.6.2.3 2008/07/28 11:50:34 pajoye Exp $ */
+/* $Id: crypt.c,v 1.62.2.1.2.6.2.4 2008/08/19 15:14:46 tony2001 Exp $ */
#include <stdlib.h>
@@ -107,15 +107,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.18.2.1.2.1.2.2&r2=1.18.2.1.2.1.2.3&diff_format=u
Index: php-src/ext/standard/php_crypt.h
diff -u php-src/ext/standard/php_crypt.h:1.18.2.1.2.1.2.2
php-src/ext/standard/php_crypt.h:1.18.2.1.2.1.2.3
--- php-src/ext/standard/php_crypt.h:1.18.2.1.2.1.2.2 Mon Jul 28 11:50:34 2008
+++ php-src/ext/standard/php_crypt.h Tue Aug 19 15:14:46 2008
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_crypt.h,v 1.18.2.1.2.1.2.2 2008/07/28 11:50:34 pajoye Exp $ */
+/* $Id: php_crypt.h,v 1.18.2.1.2.1.2.3 2008/08/19 15:14:46 tony2001 Exp $ */
#ifndef PHP_CRYPT_H
#define PHP_CRYPT_H
@@ -26,9 +26,7 @@
PHP_FUNCTION(crypt);
#if HAVE_CRYPT
PHP_MINIT_FUNCTION(crypt);
-#if PHP_WIN32
PHP_MSHUTDOWN_FUNCTION(crypt);
-#endif
PHP_RINIT_FUNCTION(crypt);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
