Commit 23c1036a authored Jan 24, 2005 by Joe Orton

Merge r125612 from trunk:

* modules/proxy/proxy_http.c (ap_proxy_http_process_response): Handle
aborted connections correctly: abort if c->aborted is set.

* modules/proxy/proxy_ftp.c (proxy_ftp_handler): Likewise.

PR: 32443
Submitted by: Janne Hietamäki, Joe Orton
Reviewed by: jorton, stoddard, jerenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@126281 13f79535-47bb-0310-9956-ffa450edef68

parent 17f42175

CHANGES

+3 −0

Changes for CHANGES: 3 added lines, 0 removed lines.
Original line number	Diff line number	Diff line
		Changes with Apache 2.0.53

		*) mod_proxy: Handle client-aborted connections correctly. PR 32443.
		[Janne Hietamäki, Joe Orton]

		*) Fix handling of files >2Gb on all platforms (or builds) where
		apr_off_t is larger than apr_size_t. PR 28898. [Joe Orton]

STATUS

+0 −5

Changes for STATUS: 0 added lines, 5 removed lines.
Original line number	Diff line number	Diff line
		@@ -81,11 +81,6 @@ PATCHES TO BACKPORT FROM 2.1
		PR: 32699
		+1: jorton, jerenkrantz

		*) mod_proxy: abort if client-connection is aborted.
		http://issues.apache.org/bugzilla/attachment.cgi?id=14046
		PR: 32443
		+1: jorton, stoddard, jerenkrantz

		*) mod_ssl: fix to access mod_ssl-specific X509_STORE_CTX userdata
		using the proper accessor function; matters only in some
		pathological cases with OpenSSL global variables not getting

modules/proxy/proxy_ftp.c

+2 −1

Changes for modules/proxy/proxy_ftp.c: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -1840,7 +1840,8 @@ int ap_proxy_ftp_handler(request_rec r, proxy_server_conf conf,
		}

		/* try send what we read */
		if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS) {
		if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS
		\|\| c->aborted) {
		/* Ack! Phbtt! Die! User aborted! */
		finish = TRUE;
		}

modules/proxy/proxy_http.c

+2 −1

Changes for modules/proxy/proxy_http.c: 2 added lines, 1 removed line.
Original line number	Diff line number	Diff line
		@@ -925,7 +925,8 @@ apr_status_t ap_proxy_http_process_response(apr_pool_t * p, request_rec *r,
		}

		/* try send what we read */
		if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS) {
		if (ap_pass_brigade(r->output_filters, bb) != APR_SUCCESS
		\|\| c->aborted) {
		/* Ack! Phbtt! Die! User aborted! */
		p_conn->close = 1; /* this causes socket close below */
		finish = TRUE;