mirror of
https://github.com/php/php-src.git
synced 2024-09-21 18:07:23 +00:00
Fix bug #77430 (php-fpm crashes with Main process exited)
This commit is contained in:
parent
26b5aa8584
commit
766b4fd515
4
NEWS
4
NEWS
@ -21,6 +21,10 @@ PHP NEWS
|
||||
. Fixed bug #77346 (webm files incorrectly detected as
|
||||
application/octet-stream). (Anatol)
|
||||
|
||||
- FPM:
|
||||
. Fixed bug #77430 (php-fpm crashes with Main process exited, code=dumped,
|
||||
status=11/SEGV). (Jakub Zelenka)
|
||||
|
||||
- GD:
|
||||
. Fixed bug #73281 (imagescale(…, IMG_BILINEAR_FIXED) can cause black border).
|
||||
(cmb)
|
||||
|
@ -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) {
|
||||
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");
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user