summaryrefslogtreecommitdiffstats
path: root/php-bug77430.patch
diff options
context:
space:
mode:
Diffstat (limited to 'php-bug77430.patch')
-rw-r--r--php-bug77430.patch36
1 files changed, 0 insertions, 36 deletions
diff --git a/php-bug77430.patch b/php-bug77430.patch
deleted file mode 100644
index 17c1ad1..0000000
--- a/php-bug77430.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff --git a/sapi/fpm/fpm/fpm_stdio.c b/sapi/fpm/fpm/fpm_stdio.c
-index ba8f6d8213..03d15cbf0d 100644
---- a/sapi/fpm/fpm/fpm_stdio.c
-+++ b/sapi/fpm/fpm/fpm_stdio.c
-@@ -122,7 +122,7 @@ static void fpm_stdio_child_said(struct fpm_event_s *ev, short which, void *arg)
- struct fpm_event_s *event;
- int fifo_in = 1, fifo_out = 1;
- int in_buf = 0;
-- int read_fail = 0, finish_log_stream = 0;
-+ int read_fail = 0, finish_log_stream = 0, create_log_stream;
- int res;
- struct zlog_stream *log_stream;
-
-@@ -138,7 +138,8 @@ static void fpm_stdio_child_said(struct fpm_event_s *ev, short which, void *arg)
- event = &child->ev_stderr;
- }
-
-- if (!child->log_stream) {
-+ create_log_stream = !child->log_stream;
-+ if (create_log_stream) {
- log_stream = child->log_stream = malloc(sizeof(struct zlog_stream));
- zlog_stream_init_ex(log_stream, ZLOG_WARNING, STDERR_FILENO);
- zlog_stream_set_decorating(log_stream, child->wp->config->decorate_workers_output);
-@@ -196,8 +197,10 @@ static void fpm_stdio_child_said(struct fpm_event_s *ev, short which, void *arg)
- }
-
- if (read_fail) {
-- zlog_stream_set_msg_suffix(log_stream, NULL, ", pipe is closed");
-- zlog_stream_finish(log_stream);
-+ if (create_log_stream) {
-+ zlog_stream_set_msg_suffix(log_stream, NULL, ", pipe is closed");
-+ zlog_stream_finish(log_stream);
-+ }
- if (read_fail < 0) {
- zlog(ZLOG_SYSERROR, "unable to read what child say");
- }