Skip to content

Commit 47397a4

Browse files
committed
Move stdio flush behind request shutdown
1 parent 6d9c521 commit 47397a4

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

sapi/fpm/fpm/fpm_main.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ int __riscosify_control = __RISCOSIFY_STRICT_UNIX_SPECS;
9090
#include "fpm.h"
9191
#include "fpm_request.h"
9292
#include "fpm_status.h"
93+
#include "fpm_stdio.h"
9394
#include "fpm_conf.h"
9495
#include "fpm_php.h"
9596
#include "fpm_log.h"
@@ -1977,6 +1978,8 @@ consult the installation file that came with this distribution, or visit \n\
19771978

19781979
php_request_shutdown((void *) 0);
19791980

1981+
fpm_stdio_flush_child();
1982+
19801983
requests++;
19811984
if (UNEXPECTED(max_requests && (requests == max_requests))) {
19821985
fcgi_request_set_keep(request, 0);

sapi/fpm/fpm/fpm_request.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
#include "fpm_children.h"
1717
#include "fpm_scoreboard.h"
1818
#include "fpm_status.h"
19-
#include "fpm_stdio.h"
2019
#include "fpm_request.h"
2120
#include "fpm_log.h"
2221

@@ -200,7 +199,6 @@ void fpm_request_end(void) /* {{{ */
200199
#endif
201200
proc->memory = memory;
202201
fpm_scoreboard_proc_release(proc);
203-
fpm_stdio_flush_child();
204202
}
205203
/* }}} */
206204

0 commit comments

Comments
 (0)