cvs: php4 /sapi/cgi cgi_main.c
| From: | Sascha Schumann | Date: | Sun, 29 Oct 2000 16:02:43 +0000 |
| Subject: | cvs: php4 /sapi/cgi cgi_main.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-2342@lists.php.net to get a copy of this message | ||
sas Sun Oct 29 08:02:43 2000 EDT
Modified files:
/php4/sapi/cgi cgi_main.c
Log:
Unify aborted connection handling
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.79 php4/sapi/cgi/cgi_main.c:1.80
--- php4/sapi/cgi/cgi_main.c:1.79 Sun Oct 29 03:38:26 2000
+++ php4/sapi/cgi/cgi_main.c Sun Oct 29 08:02:40 2000
@@ -98,12 +98,7 @@
ret = fwrite(str, 1, str_length, stdout);
if (ret != str_length) {
- PLS_FETCH();
-
- PG(connection_status) = PHP_CONNECTION_ABORTED;
- if (!PG(ignore_user_abort)) {
- zend_bailout();
- }
+ php_handle_aborted_connection();
}
return ret;
@@ -113,12 +108,7 @@
static void sapi_cgibin_flush(void *server_context)
{
if (fflush(stdout)==EOF) {
- PLS_FETCH();
-
- PG(connection_status) = PHP_CONNECTION_ABORTED;
- if (!PG(ignore_user_abort)) {
- zend_bailout();
- }
+ php_handle_aborted_connection();
}
}