cvs: php4 /sapi/apache2filter sapi_apache2.c
| From: | Sascha Schumann | Date: | Sun, 29 Oct 2000 15:10:49 +0000 |
| Subject: | cvs: php4 /sapi/apache2filter sapi_apache2.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2338@lists.php.net to get a copy of this message | ||
sas Sun Oct 29 07:10:49 2000 EDT
Modified files:
/php4/sapi/apache2filter sapi_apache2.c
Log:
Handle user aborts
Index: php4/sapi/apache2filter/sapi_apache2.c
diff -u php4/sapi/apache2filter/sapi_apache2.c:1.12 php4/sapi/apache2filter/sapi_apache2.c:1.13
--- php4/sapi/apache2filter/sapi_apache2.c:1.12 Sun Oct 29 06:52:15 2000
+++ php4/sapi/apache2filter/sapi_apache2.c Sun Oct 29 07:10:49 2000
@@ -42,7 +42,14 @@
str += now;
str_length -= now;
}
- ap_pass_brigade(ctx->f->next, bb);
+ if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
+ PLS_FETCH();
+ PG(connection_status) = PHP_CONNECTION_ABORTED;
+
+ if (!PG(ignore_user_abort)) {
+ zend_bailout();
+ }
+ }
return str_length;
}
@@ -152,7 +159,14 @@
bb = ap_brigade_create(ctx->f->r->pool);
b = ap_bucket_create_flush();
AP_BRIGADE_INSERT_TAIL(bb, b);
- ap_pass_brigade(ctx->f->next, bb);
+ if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
+ PLS_FETCH();
+ PG(connection_status) = PHP_CONNECTION_ABORTED;
+
+ if (!PG(ignore_user_abort)) {
+ zend_bailout();
+ }
+ }
}
static void php_apache_sapi_log_message(char *msg)