diff options
| author | Michael Wallner <mike@php.net> | 2015-07-22 13:44:21 +0200 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-23 16:55:15 +0000 |
| commit | 80a851b4dd622f5825e46a7318bdd80123205b02 (patch) | |
| tree | 4c29e32554b55cbade7d124deeb8dc059e5c4ae5 | |
| parent | d636467937fcfbd708f2b06c9e060bcbe9a63679 (diff) | |
| download | php-git-80a851b4dd622f5825e46a7318bdd80123205b02.tar.gz | |
Fix Bug #69865 php-fpm does not close stderr when using syslog
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | sapi/fpm/fpm/fpm_stdio.c | 6 |
2 files changed, 8 insertions, 0 deletions
@@ -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; |