[PHP-CVS] cvs: php-src /ext/spl php_spl.c

[Marcus Boerger]

helly           Thu Mar 31 12:17:39 2005 EDT

  Modified files:              
    /php-src/ext/spl    php_spl.c 
  Log:
  - Bugfix #32521 (apache2handler accidental crashes caused by SPL)
  
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.43&r2=1.44&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.43 php-src/ext/spl/php_spl.c:1.44
--- php-src/ext/spl/php_spl.c:1.43      Wed Mar  2 19:20:56 2005
+++ php-src/ext/spl/php_spl.c   Thu Mar 31 12:17:38 2005
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: php_spl.c,v 1.43 2005/03/03 00:20:56 helly Exp $ */
+/* $Id: php_spl.c,v 1.44 2005/03/31 17:17:38 helly Exp $ */
 
 #ifdef HAVE_CONFIG_H
        #include "config.h"
@@ -54,7 +54,7 @@
  */
 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_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 @@
 {
        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));

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php