Fixed bug #27424 (headers missing on flush() in apache 2 SAPIs).

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 22df068626d52016dc2c05ec323d3be9ce8b0533..987be43e9cd0be09970341522742ba33f087036e 100644 (file)
--- 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 ddafafadd9907b88c9c8e05c2b6ae52ab46f5e70..649e55c3f38954c82df8ac91e4e6b56d7cfeb5d6 100644 (file)
--- 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;