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

diff --git a/NEWS b/NEWS
index 2feea61176d58033b92e0ee0681ad842e44e485a..8f6b753d05fdd94bbbf2ad5d2ace8de551270a9d 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -9,6 +9,7 @@ PHP 4                                                                      NEWS
   (Ilia, naish at klanen dot net)
 - Fixed bug #27443 (defined() returns wrong type). (Derick)
 - Fixed bug #27437 (wrong freetype include inside GD library). (Ilia)
+- Fixed bug #27424 (headers missing on flush() in apache 2 SAPIs). (Ilia)
 - Fixed bug #27421 (mbstring.func_overload should be system ini setting).
   (Ilia)
 - Fixed bug #27384 (unpack() misbehaves with 1 char string). (GeorgeS)

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 46d446bf88313c6e986570b94974dec82102a58f..c668caecac58142b6259a6d1eb957270875fa659 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -238,7 +238,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 1859034372ff96ea1c0466b15f2fc908648163b6..46f32213222067bcce838b72fc1817b9031038f7 100644 (file)
--- a/sapi/apache2handler/sapi_apache2.c
+++ b/sapi/apache2handler/sapi_apache2.c
@@ -261,6 +261,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;