Patch patch-5.3.10-error_log for FPM related Bug #61045

Patch version 2012-03-04 18:16 UTC

Obsoleted by patches:

• bug61045-5.3.patch, revision 2012-05-05 15:53 UTC

• 2012-03-04 18:16 UTC [diff to current]

Developer: ewgraf@gmail.com

--- sapi/fpm/fpm/fpm_main.c.orig	2012-03-04 23:26:08.941459365 +0600
+++ sapi/fpm/fpm/fpm_main.c	2012-03-05 00:03:16.852506974 +0600
@@ -656,7 +656,23 @@
 	TSRMLS_FETCH();
 
 	if (CGIG(fcgi_logging)) {
-		zlog(ZLOG_NOTICE, "PHP message: %s", message);
+		if (!fpm_global_config.error_log) {
+			fcgi_request *request;
+			request = (fcgi_request*) SG(server_context);
+			
+			if (request) {
+				int len = strlen(message);
+				char *buf = malloc(len+2);
+				memcpy(buf, message, len);
+				memcpy(buf + len, "\n", sizeof("\n"));
+				fcgi_write(request, FCGI_STDERR, buf, len+1);
+				free(buf);
+			} else {
+				zlog(ZLOG_NOTICE, "PHP message: %s", message);
+			}
+		} else {
+			zlog(ZLOG_NOTICE, "PHP message: %s", message);
+		}
 	}
 }