summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2004-03-08 03:15:45 +0000
committerIlia Alshanetsky <iliaa@php.net>2004-03-08 03:15:45 +0000
commitc828007fdf90806bf1b174e0244a88f9e184b5e9 (patch)
tree44892b2fe8e46c605e55124122be46512978d1cc
parent611226073841e256144a5ed0d2a457cb6e561872 (diff)
downloadphp-git-c828007fdf90806bf1b174e0244a88f9e184b5e9.tar.gz
Fixed bug #27424 (headers missing on flush() in apache 2 SAPIs).
-rw-r--r--sapi/apache2filter/sapi_apache2.c3
-rw-r--r--sapi/apache2handler/sapi_apache2.c2
2 files changed, 5 insertions, 0 deletions
diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 22df068626..987be43e9c 100644
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -243,7 +243,10 @@ php_apache_sapi_flush(void *server_context)
if (!server_context)
return;
+ sapi_send_headers(TSRMLS_C);
+
ctx->r->status = SG(sapi_headers).http_response_code;
+ SG(headers_sent) = 1;
f = ctx->f;
diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c
index ddafafadd9..649e55c3f3 100644
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -256,6 +256,8 @@ php_apache_sapi_flush(void *server_context)
r = ctx->r;
brigade = ctx->brigade;
+ sapi_send_headers(TSRMLS_C);
+
r->status = SG(sapi_headers).http_response_code;
SG(headers_sent) = 1;