cvs: php-src /ext/spl php_spl.c
| From: | Marcus Boerger | Date: | Mon, 26 Sep 2005 17:54:59 +0000 |
| Subject: | cvs: php-src /ext/spl php_spl.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-34147@lists.php.net to get a copy of this message | ||
helly Mon Sep 26 13:54:59 2005 EDT
Modified files:
/php-src/ext/spl php_spl.c
Log:
- Reset global pointer to NULL after mem free (required for apache 1.3)
http://cvs.php.net/diff.php/php-src/ext/spl/php_spl.c?r1=1.66&r2=1.67&ty=u
Index: php-src/ext/spl/php_spl.c
diff -u php-src/ext/spl/php_spl.c:1.66 php-src/ext/spl/php_spl.c:1.67
--- php-src/ext/spl/php_spl.c:1.66 Sun Sep 25 14:06:08 2005
+++ php-src/ext/spl/php_spl.c Mon Sep 26 13:54:57 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_spl.c,v 1.66 2005/09/25 18:06:08 helly Exp $ */
+/* $Id: php_spl.c,v 1.67 2005/09/26 17:54:57 helly Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -631,6 +631,7 @@
PHP_RINIT_FUNCTION(spl) /* {{{ */
{
SPL_G(autoload_extensions) = estrndup(".inc,.php", sizeof(".inc,.php")-1);
+ SPL_G(autoload_functions) = NULL;
return SUCCESS;
} /* }}} */
@@ -643,6 +644,7 @@
if (SPL_G(autoload_functions)) {
zend_hash_destroy(SPL_G(autoload_functions));
FREE_HASHTABLE(SPL_G(autoload_functions));
+ SPL_G(autoload_functions) = NULL;
}
return SUCCESS;
} /* }}} */