iliaa Sun Mar 7 22:15:46 2004 EDT
Modified files:
/php-src/sapi/apache2filter sapi_apache2.c
/php-src/sapi/apache2handler sapi_apache2.c
Log:
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.123&r2=1.124&ty=u
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.123
php-src/sapi/apache2filter/sapi_apache2.c:1.124
--- php-src/sapi/apache2filter/sapi_apache2.c:1.123 Mon Feb 9 18:27:43 2004
+++ php-src/sapi/apache2filter/sapi_apache2.c Sun Mar 7 22:15:38 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.123 2004/02/09 23:27:43 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.124 2004/03/08 03:15:38 iliaa Exp $ */
#include <fcntl.h>
@@ -243,7 +243,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.36&r2=1.37&ty=u
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.36
php-src/sapi/apache2handler/sapi_apache2.c:1.37
--- php-src/sapi/apache2handler/sapi_apache2.c:1.36 Tue Feb 10 19:45:07 2004
+++ php-src/sapi/apache2handler/sapi_apache2.c Sun Mar 7 22:15:45 2004
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.36 2004/02/11 00:45:07 hirokawa Exp $ */
+/* $Id: sapi_apache2.c,v 1.37 2004/03/08 03:15:45 iliaa Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -256,6 +256,8 @@
r = ctx->r;
brigade = ctx->brigade;
+ sapi_send_headers(TSRMLS_C);
+
r->status = SG(sapi_headers).http_response_code;
SG(headers_sent) = 1;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
