diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-01-23 16:56:19 +0000 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-01-23 16:57:01 +0000 |
| commit | 5c6bf3598a41d7acefe6a8adf592aedc50b4bf2d (patch) | |
| tree | 8af0d2ca7ab39b811b65abbd24892f84e5ede67f | |
| parent | eac0b2e98f58351c8062536d39c36b4d1ac7c9a6 (diff) | |
| parent | 9aad38038e8bd41b9bf89c00804943509e10fe1a (diff) | |
| download | php-git-5c6bf3598a41d7acefe6a8adf592aedc50b4bf2d.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
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
@@ -52,6 +52,8 @@ PHP NEWS - FPM: . Configuration to limit fpm slow log trace callers. (Sannis) + . Fixed bug #69865 (php-fpm does not close stderr when using syslog). + (m6w6) - GD: . Implemented imageresolution as getter and setter (Christoph) 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; |