cvs: php-src /sapi/cgi cgi_main.c
| From: | Wez Furlong | Date: | Thu, 16 Jun 2005 14:54:52 +0000 |
| Subject: | cvs: php-src /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-32311@lists.php.net to get a copy of this message | ||
wez Thu Jun 16 10:54:52 2005 EDT
Modified files:
/php-src/sapi/cgi cgi_main.c
Log:
Don't crash here if there are errors (such as failing to load extensions via
php.ini) during startup.
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.265&r2=1.266&ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.265 php-src/sapi/cgi/cgi_main.c:1.266
--- php-src/sapi/cgi/cgi_main.c:1.265 Fri Jun 3 19:11:51 2005
+++ php-src/sapi/cgi/cgi_main.c Thu Jun 16 10:54:51 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.265 2005/06/03 23:11:51 sniper Exp $ */
+/* $Id: cgi_main.c,v 1.266 2005/06/16 14:54:51 wez Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -491,7 +491,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 */