iliaa Sat Aug 2 14:30:22 2003 EDT
Modified files: (Branch: PHP_4_3)
/php-src/sapi/apache2handler sapi_apache2.c
/php-src/sapi/apache2filter sapi_apache2.c
/php-src NEWS
Log:
MFH: 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.1.2.18
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.19
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.18 Fri Aug 1 16:21:21 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Sat Aug 2 14:30:21 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.18 2003/08/01 20:21:21 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.19 2003/08/02 18:30:21 iliaa Exp $ */
#include <fcntl.h>
@@ -259,6 +259,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.91.2.18
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.19
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.18 Fri Aug 1 16:21:21 2003
+++ php-src/sapi/apache2filter/sapi_apache2.c Sat Aug 2 14:30:22 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.91.2.18 2003/08/01 20:21:21 iliaa Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.19 2003/08/02 18:30:22 iliaa Exp $ */
#include <fcntl.h>
@@ -236,7 +236,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
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.320 php-src/NEWS:1.1247.2.321
--- php-src/NEWS:1.1247.2.320 Fri Aug 1 16:21:21 2003
+++ php-src/NEWS Sat Aug 2 14:30:22 2003
@@ -3,6 +3,7 @@
?? Aug 2003, Version 4.3.3RC3
- Fixed bug #24883 (variables_order and gpc_order being ignored). (Ilia)
- Fixed bug #24871 (methods misidentified as constructors). (Ilia)
+- Fixed bug #24177 (Status not set correctly after flush() in Apache 2). (Ilia)
- Fixed bug #23509 (exit code lost when exit() called from
register_shutdown_function()). (Ilia)
- Fixed bug #22154 (Possible crash when memory_limit is reached and
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
