iliaa           Sun Mar  7 22:16:15 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/sapi/apache2filter sapi_apache2.c 
    /php-src/sapi/apache2handler        sapi_apache2.c 
    /php-src    NEWS 
  Log:
  MFH: Fixed bug #27424 (headers missing on flush() in apache 2 SAPIs).
  
  
http://cvs.php.net/diff.php/php-src/sapi/apache2filter/sapi_apache2.c?r1=1.91.2.23&r2=1.91.2.24&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.23 
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.24
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.23 Mon Feb  9 18:28:48 2004
+++ php-src/sapi/apache2filter/sapi_apache2.c   Sun Mar  7 22:16:11 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.91.2.23 2004/02/09 23:28:48 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.24 2004/03/08 03:16:11 iliaa Exp $ */
 
 #include <fcntl.h>
 
@@ -238,7 +238,10 @@
        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;
 
http://cvs.php.net/diff.php/php-src/sapi/apache2handler/sapi_apache2.c?r1=1.1.2.28&r2=1.1.2.29&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.28 
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.29
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.28 Wed Feb 11 11:53:03 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c  Sun Mar  7 22:16:12 2004
@@ -18,7 +18,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: sapi_apache2.c,v 1.1.2.28 2004/02/11 16:53:03 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.29 2004/03/08 03:16:12 iliaa Exp $ */
 
 #include <fcntl.h>
 
@@ -261,6 +261,8 @@
        r = ctx->r;
        brigade = ctx->brigade;
 
+       sapi_send_headers(TSRMLS_C);
+
        r->status = SG(sapi_headers).http_response_code;
        SG(headers_sent) = 1;
 
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.585&r2=1.1247.2.586&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.585 php-src/NEWS:1.1247.2.586
--- php-src/NEWS:1.1247.2.585   Sat Mar  6 14:30:34 2004
+++ php-src/NEWS        Sun Mar  7 22:16:13 2004
@@ -9,6 +9,7 @@
   (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)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to