summaryrefslogtreecommitdiffstats
path: root/php-5.4.16-fpm.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-5.4.16-fpm.patch')
-rw-r--r--php-5.4.16-fpm.patch31
1 files changed, 0 insertions, 31 deletions
diff --git a/php-5.4.16-fpm.patch b/php-5.4.16-fpm.patch
deleted file mode 100644
index 4a32fcf..0000000
--- a/php-5.4.16-fpm.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 9f6ca9bc6400fc9c8eaebf963f6eb048dde4b34f Mon Sep 17 00:00:00 2001
-From: Remi Collet <remi@php.net>
-Date: Fri, 24 May 2013 12:09:05 +0200
-Subject: [PATCH] Fixed Bug #64915 (error_log ignored when daemonize=0)
-
-Use configured error_log file when stderr is not a tty.
-So only use tty during interactive debug run.
----
- NEWS | 3 +++
- sapi/fpm/fpm/fpm_stdio.c | 4 ++++
- 2 files changed, 7 insertions(+)
-
-diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
-index 10b867d..d81e101 100644
---- a/sapi/fpm/fpm/fpm_stdio.c
-+++ b/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);
- }
- }
---
-1.7.11.5
-