iliaa Fri Aug 1 16:21:22 2003 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 #22072 (Apache2 sapis do not detect aborted connections)
Index: php-src/sapi/apache2filter/sapi_apache2.c
diff -u php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.17
php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.18
--- php-src/sapi/apache2filter/sapi_apache2.c:1.91.2.17 Fri Jul 11 00:24:11 2003
+++ php-src/sapi/apache2filter/sapi_apache2.c Fri Aug 1 16:21:21 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.91.2.17 2003/07/11 04:24:11 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.91.2.18 2003/08/01 20:21:21 iliaa Exp $ */
#include <fcntl.h>
@@ -86,7 +86,7 @@
APR_BRIGADE_INSERT_TAIL(bb, b);
#endif
- if (ap_pass_brigade(f->next, bb) != APR_SUCCESS) {
+ if (ap_pass_brigade(f->next, bb) != APR_SUCCESS ||
ctx->r->connection->aborted) {
php_handle_aborted_connection();
}
@@ -248,7 +248,7 @@
bb = apr_brigade_create(ctx->r->pool, ba);
b = apr_bucket_flush_create(ba);
APR_BRIGADE_INSERT_TAIL(bb, b);
- if (ap_pass_brigade(f->next, bb) != APR_SUCCESS) {
+ if (ap_pass_brigade(f->next, bb) != APR_SUCCESS ||
ctx->r->connection->aborted) {
php_handle_aborted_connection();
}
}
@@ -477,7 +477,7 @@
rv = ap_pass_brigade(f->next, prebb);
/* XXX: destroy the prebb, since we know we're
* done with it? */
- if (rv != APR_SUCCESS) {
+ if (rv != APR_SUCCESS || ctx->r->connection->aborted) {
php_handle_aborted_connection();
}
}
Index: php-src/sapi/apache2handler/sapi_apache2.c
diff -u php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.17
php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.18
--- php-src/sapi/apache2handler/sapi_apache2.c:1.1.2.17 Fri Jul 11 00:24:11 2003
+++ php-src/sapi/apache2handler/sapi_apache2.c Fri Aug 1 16:21:21 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: sapi_apache2.c,v 1.1.2.17 2003/07/11 04:24:11 sniper Exp $ */
+/* $Id: sapi_apache2.c,v 1.1.2.18 2003/08/01 20:21:21 iliaa Exp $ */
#include <fcntl.h>
@@ -86,7 +86,7 @@
APR_BRIGADE_INSERT_TAIL(brigade, bucket);
- if (ap_pass_brigade(r->output_filters, brigade) != APR_SUCCESS) {
+ if (ap_pass_brigade(r->output_filters, brigade) != APR_SUCCESS ||
r->connection->aborted) {
php_handle_aborted_connection();
}
/* Ensure this brigade is empty for the next usage. */
@@ -263,7 +263,7 @@
/* Send a flush bucket down the filter chain. */
bucket = apr_bucket_flush_create(r->connection->bucket_alloc);
APR_BRIGADE_INSERT_TAIL(brigade, bucket);
- if (ap_pass_brigade(r->output_filters, brigade) != APR_SUCCESS) {
+ if (ap_pass_brigade(r->output_filters, brigade) != APR_SUCCESS ||
r->connection->aborted) {
php_handle_aborted_connection();
}
apr_brigade_cleanup(brigade);
@@ -550,7 +550,7 @@
APR_BRIGADE_INSERT_TAIL(brigade, bucket);
rv = ap_pass_brigade(r->output_filters, brigade);
- if (rv != APR_SUCCESS) {
+ if (rv != APR_SUCCESS || r->connection->aborted) {
php_handle_aborted_connection();
}
apr_brigade_cleanup(brigade);
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.319 php-src/NEWS:1.1247.2.320
--- php-src/NEWS:1.1247.2.319 Fri Aug 1 08:29:48 2003
+++ php-src/NEWS Fri Aug 1 16:21:21 2003
@@ -7,6 +7,7 @@
register_shutdown_function()). (Ilia)
- Fixed bug #22154 (Possible crash when memory_limit is reached and
output buffering in addition to session.use_trans_sid is used). (Ilia)
+- Fixed bug #22072 (Apache2 sapis do not detect aborted connections). (Ilia)
30 Jul 2003, Version 4.3.3RC2
- Improved the NSAPI SAPI module (Uwe Schindler)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
