summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorMarcus Boerger <helly@php.net>2005-03-31 17:17:38 (GMT)
committerMarcus Boerger <helly@php.net>2005-03-31 17:17:38 (GMT)
commit3eb4162122efdfbf952ec27573969995428b2025 (patch)
treedbee780e7a4480581d50e97ed2acdba8bb5aa2fd /ext
parent3a947f256a4b11a659db1abe090c2e560dedf391 (diff)
downloadphp-3eb4162122efdfbf952ec27573969995428b2025.tar.gz
- Bugfix #32521 (apache2handler accidental crashes caused by SPL)
Diffstat (limited to 'ext')
-rwxr-xr-xext/spl/php_spl.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/ext/spl/php_spl.c b/ext/spl/php_spl.c
index bd88694..cbd0deb 100755
--- a/ext/spl/php_spl.c
+++ b/ext/spl/php_spl.c
@@ -54,7 +54,7 @@ function_entry spl_functions_none[] = {
*/
static void spl_init_globals(zend_spl_globals *spl_globals)
{
- spl_globals->autoload_extensions = ".inc,.inc.php";
+ spl_globals->autoload_extensions = NULL;
spl_globals->autoload_functions = NULL;
}
/* }}} */
@@ -507,7 +507,7 @@ PHP_MINIT_FUNCTION(spl)
PHP_RINIT_FUNCTION(spl) /* {{{ */
{
- SPL_G(autoload_extensions) = estrdup(SPL_G(autoload_extensions));
+ SPL_G(autoload_extensions) = estrdup(".inc,.inc.php");
return SUCCESS;
} /* }}} */
@@ -515,6 +515,7 @@ PHP_RSHUTDOWN_FUNCTION(spl) /* {{{ */
{
if (SPL_G(autoload_extensions)) {
efree(SPL_G(autoload_extensions));
+ SPL_G(autoload_extensions) = NULL;
}
if (SPL_G(autoload_functions)) {
zend_hash_destroy(SPL_G(autoload_functions));