cvs: php-src(PHP_4_4) /sapi/cgi cgi_main.c
| From: | Dmitry Stogov | Date: | Wed, 22 Feb 2006 15:11:53 +0000 |
| Subject: | cvs: php-src(PHP_4_4) /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-36990@lists.php.net to get a copy of this message | ||
dmitry Wed Feb 22 15:11:53 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/sapi/cgi cgi_main.c
Log:
Fixed crash on error message during PHP startup in FastCGI
http://cvs.php.net/viewcvs.cgi/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.68.2.4&r2=1.190.2.68.2.5&diff_format=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.4 php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.5
--- php-src/sapi/cgi/cgi_main.c:1.190.2.68.2.4 Fri Feb 3 16:31:09 2006
+++ php-src/sapi/cgi/cgi_main.c Wed Feb 22 15:11:53 2006
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.190.2.68.2.4 2006/02/03 16:31:09 dmitry Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.68.2.5 2006/02/22 15:11:53 dmitry Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -483,7 +483,9 @@
if (!FCGX_IsCGI() && logging) {
FCGX_Request *request = (FCGX_Request *)SG(server_context);
- FCGX_FPrintF( request->err, "%s\n", message );
+ if (request) {
+ FCGX_FPrintF( request->err, "%s\n", message );
+ }
/* ignore return code */
} else
#endif /* PHP_FASTCGI */