tony2001 Mon Mar 20 23:32:58 2006 UTC
Modified files: (Branch: PHP_5_1)
/php-src/ext/standard basic_functions.c
Log:
shutdown syslog module before freeing basic_globals
http://cvs.php.net/viewcvs.cgi/php-src/ext/standard/basic_functions.c?r1=1.725.2.28&r2=1.725.2.29&diff_format=u
Index: php-src/ext/standard/basic_functions.c
diff -u php-src/ext/standard/basic_functions.c:1.725.2.28
php-src/ext/standard/basic_functions.c:1.725.2.29
--- php-src/ext/standard/basic_functions.c:1.725.2.28 Mon Mar 20 23:06:00 2006
+++ php-src/ext/standard/basic_functions.c Mon Mar 20 23:32:58 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: basic_functions.c,v 1.725.2.28 2006/03/20 23:06:00 tony2001 Exp $ */
+/* $Id: basic_functions.c,v 1.725.2.29 2006/03/20 23:32:58 tony2001 Exp $ */
#include "php.h"
#include "php_streams.h"
@@ -1126,6 +1126,9 @@
PHP_MSHUTDOWN_FUNCTION(basic)
{
+#ifdef HAVE_SYSLOG_H
+ PHP_MSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
+#endif
#ifdef ZTS
ts_free_id(basic_globals_id);
#ifdef PHP_WIN32
@@ -1150,9 +1153,6 @@
PHP_MSHUTDOWN(url_scanner_ex)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_MSHUTDOWN(file)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
PHP_MSHUTDOWN(standard_filters)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
-#ifdef HAVE_SYSLOG_H
- PHP_MSHUTDOWN(syslog)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
-#endif
#if defined(HAVE_LOCALECONV) && defined(ZTS)
PHP_MSHUTDOWN(localeconv)(SHUTDOWN_FUNC_ARGS_PASSTHRU);
#endif
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
