summaryrefslogtreecommitdiff
path: root/sapi/apache/mod_php4.c
diff options
context:
space:
mode:
authorSascha Schumann <sas@php.net>2000-10-29 16:01:02 +0000
committerSascha Schumann <sas@php.net>2000-10-29 16:01:02 +0000
commit27a84800287f5c4ea8df10dba152dcdf38e874b7 (patch)
tree04c14b43b9c447e6f27880ac5b1bfe4bcb8e9690 /sapi/apache/mod_php4.c
parent13183ed5c3d18abc8a352defdd3f567125fe5bb9 (diff)
downloadphp-git-27a84800287f5c4ea8df10dba152dcdf38e874b7.tar.gz
Add/unify aborted connection handling
Diffstat (limited to 'sapi/apache/mod_php4.c')
-rw-r--r--sapi/apache/mod_php4.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/sapi/apache/mod_php4.c b/sapi/apache/mod_php4.c
index eea725287b..5245e1e31e 100644
--- a/sapi/apache/mod_php4.c
+++ b/sapi/apache/mod_php4.c
@@ -126,7 +126,6 @@ static int sapi_apache_ub_write(const char *str, uint str_length)
{
int ret;
SLS_FETCH();
- PLS_FETCH();
if (SG(server_context)) {
ret = rwrite(str, str_length, (request_rec *) SG(server_context));
@@ -134,10 +133,7 @@ static int sapi_apache_ub_write(const char *str, uint str_length)
ret = fwrite(str, 1, str_length, stderr);
}
if(ret != str_length) {
- PG(connection_status) = PHP_CONNECTION_ABORTED;
- if (!PG(ignore_user_abort)) {
- zend_bailout();
- }
+ php_handle_aborted_connection();
}
return ret;
}