cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c
| From: | Dmitry Stogov | Date: | Fri, 15 Aug 2008 07:30:31 +0000 |
| Subject: | cvs: php-src(PHP_5_2) /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52368@lists.php.net to get a copy of this message | ||
dmitry Fri Aug 15 07:30:31 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
Log:
Fixed double call to MSHUTDOWN in case of
php-cgi -m
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.59&r2=1.267.2.15.2.60&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.59 php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.60
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.59 Wed Aug 13 01:01:29 2008
+++ php-src/sapi/cgi/cgi_main.c Fri Aug 15 07:30:31 2008
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.59 2008/08/13 01:01:29 jani Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.60 2008/08/15 07:30:31 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -238,6 +238,7 @@
zend_llist sorted_exts;
zend_llist_copy(&sorted_exts, &zend_extensions);
+ sorted_exts.dtor = NULL;
zend_llist_sort(&sorted_exts, extension_name_cmp TSRMLS_CC);
zend_llist_apply_with_argument(&sorted_exts, (llist_apply_with_arg_func_t)
print_extension_info, NULL TSRMLS_CC);
zend_llist_destroy(&sorted_exts);