dmitry Mon May 21 09:08:13 2007 UTC
Modified files: (Branch: PHP_5_2)
/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.267.2.15.2.38&r2=1.267.2.15.2.39&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.38
php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.39
--- php-src/sapi/cgi/cgi_main.c:1.267.2.15.2.38 Sun May 20 15:56:09 2007
+++ php-src/sapi/cgi/cgi_main.c Mon May 21 09:08:12 2007
@@ -21,7 +21,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.267.2.15.2.38 2007/05/20 15:56:09 iliaa Exp $ */
+/* $Id: cgi_main.c,v 1.267.2.15.2.39 2007/05/21 09:08:12 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -1429,6 +1429,9 @@
switch (c) {
case 'h':
case '?':
+#if PHP_FASTCGI
+ fcgi_shutdown();
+#endif
no_headers = 1;
php_output_startup();
php_output_activate(TSRMLS_C);
@@ -1823,6 +1826,7 @@
}
/* end of fastcgi loop */
}
+ fcgi_shutdown();
#endif
if (cgi_sapi_module.php_ini_path_override) {
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.c?r1=1.4.2.13.2.25&r2=1.4.2.13.2.26&diff_format=u
Index: php-src/sapi/cgi/fastcgi.c
diff -u php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.25
php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.26
--- php-src/sapi/cgi/fastcgi.c:1.4.2.13.2.25 Thu May 10 15:21:02 2007
+++ php-src/sapi/cgi/fastcgi.c Mon May 21 09:08:13 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.c,v 1.4.2.13.2.25 2007/05/10 15:21:02 dmitry Exp $ */
+/* $Id: fastcgi.c,v 1.4.2.13.2.26 2007/05/21 09:08:13 dmitry Exp $ */
#include "php.h"
#include "fastcgi.h"
@@ -255,6 +255,11 @@
}
}
+void fcgi_shutdown(void)
+{
+ is_fastcgi = 0;
+}
+
#ifdef _WIN32
/* Do some black magic with the NT security API.
* We prepare a DACL (Discretionary Access Control List) so that
http://cvs.php.net/viewvc.cgi/php-src/sapi/cgi/fastcgi.h?r1=1.2.2.4.2.4&r2=1.2.2.4.2.5&diff_format=u
Index: php-src/sapi/cgi/fastcgi.h
diff -u php-src/sapi/cgi/fastcgi.h:1.2.2.4.2.4
php-src/sapi/cgi/fastcgi.h:1.2.2.4.2.5
--- php-src/sapi/cgi/fastcgi.h:1.2.2.4.2.4 Wed Mar 28 15:39:22 2007
+++ php-src/sapi/cgi/fastcgi.h Mon May 21 09:08:13 2007
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: fastcgi.h,v 1.2.2.4.2.4 2007/03/28 15:39:22 dmitry Exp $ */
+/* $Id: fastcgi.h,v 1.2.2.4.2.5 2007/05/21 09:08:13 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
