archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Add/unify aborted connection handling

Browse source
This commit is contained in:
Sascha Schumann 2000-10-29 16:01:02 +00:00
parent 13183ed5c3
commit 27a8480028
4 changed files with 14 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

3
sapi/aolserver/aolserver.c
View file

@ -98,6 +98,9 @@ php_ns_sapi_ub_write(const char *str, uint str_length)
sent_bytes = Ns_ConnWrite(NSG(conn), (void *) str, str_length); sent_bytes = Ns_ConnWrite(NSG(conn), (void *) str, str_length);
if (sent_bytes != str_length)
php_handle_aborted_connection();
return sent_bytes; return sent_bytes;
} }

6
sapi/apache/mod_php4.c
View file

@ -126,7 +126,6 @@ static int sapi_apache_ub_write(const char *str, uint str_length)
{ {
int ret; int ret;
SLS_FETCH(); SLS_FETCH();
PLS_FETCH();
if (SG(server_context)) { if (SG(server_context)) {
ret = rwrite(str, str_length, (request_rec *) 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); ret = fwrite(str, 1, str_length, stderr);
} }
if(ret != str_length) { if(ret != str_length) {
PG(connection_status) = PHP_CONNECTION_ABORTED; php_handle_aborted_connection();
if (!PG(ignore_user_abort)) {
zend_bailout();
}
} }
return ret; return ret;
} }

14
sapi/apache2filter/sapi_apache2.c
View file

@ -43,12 +43,7 @@ php_apache_sapi_ub_write(const char *str, uint str_length)
str_length -= now; str_length -= now;
} }
if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) { if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
PLS_FETCH(); php_handle_aborted_connection();
PG(connection_status) = PHP_CONNECTION_ABORTED;
if (!PG(ignore_user_abort)) {
zend_bailout();
}
} }
return str_length; return str_length;
@ -160,12 +155,7 @@ php_apache_sapi_flush(void *server_context)
b = ap_bucket_create_flush(); b = ap_bucket_create_flush();
AP_BRIGADE_INSERT_TAIL(bb, b); AP_BRIGADE_INSERT_TAIL(bb, b);
if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) { if (ap_pass_brigade(ctx->f->next, bb) != APR_SUCCESS) {
PLS_FETCH(); php_handle_aborted_connection();
PG(connection_status) = PHP_CONNECTION_ABORTED;
if (!PG(ignore_user_abort)) {
zend_bailout();
}
} }
} }

9
sapi/thttpd/thttpd.c
View file

@ -40,9 +40,16 @@ static php_thttpd_globals thttpd_globals;
static int sapi_thttpd_ub_write(const char *str, uint str_length) static int sapi_thttpd_ub_write(const char *str, uint str_length)
{ {
int n;
TLS_FETCH(); TLS_FETCH();
return send(TG(hc)->conn_fd, str, str_length, 0); n = send(TG(hc)->conn_fd, str, str_length, 0);
if (n == EPIPE) {
php_handle_aborted_connection();
}
return n;
} }
static int sapi_thttpd_send_headers(sapi_headers_struct *sapi_headers SLS_DC) static int sapi_thttpd_send_headers(sapi_headers_struct *sapi_headers SLS_DC)