dmitry Mon Jan 29 19:36:01 2007 UTC
Modified files: (Branch: PHP_5_2)
/php-src/sapi/cgi cgi_main.c
Log:
Prevent flush of closed handle on php_module_shutdown()
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.267.2.15.2.20&r2=1.267.2.15.2.21&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.20
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.21
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.20 Mon Jan 1 09:36:12 2007
+++ php-src/sapi/cgi/cgi_main.c Mon Jan 29 19:36:01 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.20 2007/01/01 09:36:12 sebastian Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.21 2007/01/29 19:36:01 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1519,6 +1519,7 @@
case 'i': /* php info & quit */
if
(php_request_startup(TSRMLS_C) == FAILURE) {
+ SG(server_context) =
NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1566,6 +1567,7 @@
case 'v': /* show php version & quit */
no_headers = 1;
if
(php_request_startup(TSRMLS_C) == FAILURE) {
+ SG(server_context) =
NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1673,6 +1675,7 @@
fcgi_finish_request(&request);
}
#endif
+ SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}
@@ -1705,6 +1708,7 @@
}
#endif
php_request_shutdown((void *) 0);
+ SG(server_context) = NULL;
php_module_shutdown(TSRMLS_C);
return FAILURE;
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
