clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-24 03:17:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

shudown crypt correctly and fix memleak in ZTS mode

Browse Source
This commit is contained in:
Antony Dovgal 2008-08-19 15:14:15 +00:00
parent bc9540c564
commit 9bb1694aa4
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ext/standard/basic_functions.c
View File

@ -4105,7 +4105,6 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
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 @@ PHP_MSHUTDOWN_FUNCTION(basic) /* {{{ */
#if defined(HAVE_LOCALECONV) && defined(ZTS)
PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
PHP_MSHUTDOWN(crypt)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
return SUCCESS;
}

7
ext/standard/crypt.c
View File

@ -108,15 +108,16 @@ PHP_MINIT_FUNCTION(crypt) /* {{{ */
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";

1
ext/standard/php_crypt.h
View File

@ -26,6 +26,7 @@
PHP_FUNCTION(crypt);
#if HAVE_CRYPT
PHP_MINIT_FUNCTION(crypt);
PHP_MSHUTDOWN_FUNCTION(crypt);
PHP_RINIT_FUNCTION(crypt);
#endif