Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fixed Bug #64915 (error_log ignored when daemonize=0)

sapi/fpm/fpm/fpm_stdio.c

@@ -291,7 +291,11 @@ int fpm_stdio_open_error_log(int reopen) /* {{{ */
 		fd = fpm_globals.error_log_fd; /* for FD_CLOSEXEC to work */
 	} else {
 		fpm_globals.error_log_fd = fd;
+#if HAVE_UNISTD_H
+		if (fpm_global_config.daemonize || !isatty(STDERR_FILENO)) {
+#else
 		if (fpm_global_config.daemonize) {
+#endif
 			zlog_set_fd(fpm_globals.error_log_fd);
 		}
 	}