Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fix Bug #69865 php-fpm does not close stderr when using syslog

NEWS

@@ -17,6 +17,10 @@ PHP                                                                        NEWS
   . Fixed bug #73904 (php-cgi fails to load -c specified php.ini file). (Anatol)
   . Fixed bug #72898 (PHP_FCGI_CHILDREN is not included in phpinfo()). (Anatol)
 
+- FPM:
+  . Fixed bug #69865 (php-fpm does not close stderr when using syslog). 
+    (m6w6)
+
 - GD:
   . Fixed bug #73968 (Premature failing of XBM reading). (cmb)
 

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;