From 80a851b4dd622f5825e46a7318bdd80123205b02 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Wed, 22 Jul 2015 13:44:21 +0200
Subject: Fix Bug #69865 php-fpm does not close stderr when using syslog

---
 NEWS                     | 2 ++
 sapi/fpm/fpm/fpm_stdio.c | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/NEWS b/NEWS
index ac14eebb00..e76d75513a 100644
--- 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
index e28c0cbe7f..40720176e1 100644
--- 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;
-- 
cgit v1.2.1