cvs: php-src(PHP_4_3) / NEWS /sapi/cgi cgi_main.c
| From: | Jani Taskinen | Date: | Mon, 10 Jan 2005 15:39:21 +0000 |
| Subject: | cvs: php-src(PHP_4_3) / NEWS /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-29854@lists.php.net to get a copy of this message | ||
sniper Mon Jan 10 10:39:21 2005 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/sapi/cgi cgi_main.c
Log:
MFH: - Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.796&r2=1.1247.2.797&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.796 php-src/NEWS:1.1247.2.797
--- php-src/NEWS:1.1247.2.796 Sun Jan 9 13:27:27 2005
+++ php-src/NEWS Mon Jan 10 10:39:20 2005
@@ -25,6 +25,8 @@
path of the request URI). (kameshj at fastmail dot fm)
- Fixed bug #28930 (PHP sources pick wrong header files generated by bison).
(eggert at gnu dot org)
+- Fixed bug #28074 (FastCGI: stderr should be written in a FCGI stderr stream).
+ (chris at ex-parrot dot com)
- Fixed bug #7782 (Cannot use PATH_INFO fully with php isapi). (Unknown)
15 Dec 2004, Version 4.3.10
http://cvs.php.net/diff.php/php-src/sapi/cgi/cgi_main.c?r1=1.190.2.62&r2=1.190.2.63&ty=u
Index: php-src/sapi/cgi/cgi_main.c
diff -u php-src/sapi/cgi/cgi_main.c:1.190.2.62 php-src/sapi/cgi/cgi_main.c:1.190.2.63
--- php-src/sapi/cgi/cgi_main.c:1.190.2.62 Wed Jul 14 18:38:18 2004
+++ php-src/sapi/cgi/cgi_main.c Mon Jan 10 10:39:20 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: cgi_main.c,v 1.190.2.62 2004/07/14 22:38:18 edink Exp $ */
+/* $Id: cgi_main.c,v 1.190.2.63 2005/01/10 15:39:20 sniper Exp $ */
#include "php.h"
#include "php_globals.h"
@@ -481,6 +481,13 @@
static void sapi_cgi_log_message(char *message)
{
+#if PHP_FASTCGI
+ if (!FCGX_IsCGI()) {
+ FCGX_Request *request = (FCGX_Request *)SG(server_context);
+ FCGX_FPrintF( request->err, "%s\n", message );
+ /* ignore return code */
+ } else
+#endif /* PHP_FASTCGI */
fprintf(stderr, "%s\n", message);
}