dmitry Mon May 21 09:08:25 2007 UTC
Modified files:
/php-src/sapi/cgi cgi_main.c fastcgi.c fastcgi.h
Log:
Fixed crash on "php -b 1234 -unknown-option"
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.321&r2=1.322&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.321 php-src/sapi/cgi/cgi_main.c:1.322
--- php-src/sapi/cgi/cgi_main.c:1.321 Tue May 15 08:17:20 2007
+++ php-src/sapi/cgi/cgi_main.c Mon May 21 09:08:25 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.321 2007/05/15 08:17:20 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.322 2007/05/21 09:08:25 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1369,6 +1369,7 @@
switch (c) {
case 'h':
case '?':
+ fcgi_shutdown();
no_headers = 1;
php_output_tearup();
SG(headers_sent) = 1;
@@ -1735,6 +1736,7 @@
}
/* end of fastcgi loop */
}
+ fcgi_shutdown();
if (cgi_sapi_module.php_ini_path_override) {
free(cgi_sapi_module.php_ini_path_override);
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.38&r2=1.39&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.38 php-src/sapi/cgi/fastcgi.c:1.39
--- php-src/sapi/cgi/fastcgi.c:1.38 Thu May 10 15:22:15 2007
+++ php-src/sapi/cgi/fastcgi.c Mon May 21 09:08:25 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.c,v 1.38 2007/05/10 15:22:15 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.39 2007/05/21 09:08:25 dmitry Exp $ */
#include "php.h"
#include "fastcgi.h"
@@ -177,6 +177,11 @@
return in_shutdown;
}
+void fcgi_shutdown(void)
+{
+ is_fastcgi = 0;
+}
+
int fcgi_init(void)
{
if (!is_initialized) {
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.8&r2=1.9&diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.8 php-src/sapi/cgi/fastcgi.h:1.9
--- php-src/sapi/cgi/fastcgi.h:1.8 Wed Mar 28 15:39:35 2007
+++ php-src/sapi/cgi/fastcgi.h Mon May 21 09:08:25 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.h,v 1.8 2007/03/28 15:39:35 dmitry Exp $ */
+/* $Id: fastcgi.h,v 1.9 2007/05/21 09:08:25 dmitry Exp $ */
/* FastCGI protocol */
@@ -112,6 +112,7 @@
} fcgi_request;
int fcgi_init(void);
+void fcgi_shutdown(void);
int fcgi_is_fastcgi(void);
int fcgi_in_shutdown(void);
int fcgi_listen(const char *path, int backlog);
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
