iliaa Sat Aug 2 14:29:31 2003 EDT
Modified files:
/php-src/sapi/apache2handler sapi_apache2.c
/php-src/sapi/apache2filter sapi_apache2.c
Log:
Fixed bug #24177 (Status not set correctly after flush() in Apache 2)
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.23
php-src/sapi/apache2handler/sapi_apache2.c:1.24
--- php-src/sapi/apache2handler/sapi_apache2.c:1.23 Fri Aug 1 16:20:11 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Sat Aug 2 14:29:30 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.23 2003/08/01 20:20:11 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.24 2003/08/02 18:29:30 iliaa Exp $ */
#include <fcntl.h>
@@ -254,6 +254,8 @@
r = ctx->r;
brigade = ctx->brigade;
+
+ r->status = SG(sapi_headers).http_response_code;
/* Send a flush bucket down the filter chain. */
bucket = apr_bucket_flush_create(r->connection->bucket_alloc);
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.117
php-src/sapi/apache2filter/sapi_apache2.c:1.118
--- php-src/sapi/apache2filter/sapi_apache2.c:1.117 Fri Aug 1 16:20:11 2003
+++ php-src/sapi/apache2filter/sapi_apache2.c Sat Aug 2 14:29:30 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.117 2003/08/01 20:20:11 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.118 2003/08/02 18:29:30 iliaa Exp $ */
#include <fcntl.h>
@@ -241,7 +241,9 @@
* then don't bother flushing. */
if (!server_context)
return;
-
+
+ ctx->r->status = SG(sapi_headers).http_response_code;
+
f = ctx->f;
/* Send a flush bucket down the filter chain. The current default
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
