Fix Bug #69865 php-fpm does not close stderr when using syslog

m6w6 · krakjoe · commit 80a851b4dd62 · 2017-01-23T16:55:15.000Z
diff --git a/NEWS b/NEWS
@@ -15,6 +15,8 @@ PHP                                                                        NEWS
 - FPM:
   . Fixed bug #67583 (double fastcgi_end_request on max_children limit).
     (Dmitry Saprykin)
+  . Fixed bug #69865 (php-fpm does not close stderr when using syslog). 
+    (m6w6)
 
 - GD:
   . Fixed bug #73968 (Premature failing of XBM reading). (cmb)
diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
@@ -73,6 +73,12 @@ int fpm_stdio_init_final() /* {{{ */
 				return -1;
 			}
 		}
+#ifdef HAVE_SYSLOG_H
+		else if (fpm_globals.error_log_fd == ZLOG_SYSLOG) {
+			/* dup to /dev/null when using syslog */
+			dup2(STDOUT_FILENO, STDERR_FILENO);
+		}
+#endif
 	}
 	zlog_set_launched();
 	return 0;

Original file line number	Diff line number	Diff line change
`@@ -73,6 +73,12 @@ int fpm_stdio_init_final() /* {{{ */`
`73`	`73`	`return -1;`
`74`	`74`	`}`
`75`	`75`	`}`
	`76`	`+#ifdef HAVE_SYSLOG_H`
	`77`	`+ else if (fpm_globals.error_log_fd == ZLOG_SYSLOG) {`
	`78`	`+ /* dup to /dev/null when using syslog */`
	`79`	`+ dup2(STDOUT_FILENO, STDERR_FILENO);`
	`80`	`+ }`
	`81`	`+#endif`
`76`	`82`	`}`
`77`	`83`	`zlog_set_launched();`
`78`	`84`	`return 0;`