You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by jo...@apache.org on 2005/01/24 13:50:06 UTC
svn commit: r126281 - /httpd/httpd/branches/2.0.x/CHANGES /httpd/httpd/branches/2.0.x/STATUS /httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c /httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c
Author: jorton
Date: Mon Jan 24 04:50:04 2005
New Revision: 126281
URL: http://svn.apache.org/viewcvs?view=rev&rev=126281
Log:
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
Modified:
httpd/httpd/branches/2.0.x/CHANGES
httpd/httpd/branches/2.0.x/STATUS
httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c
httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c
Modified: httpd/httpd/branches/2.0.x/CHANGES
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/CHANGES?view=diff&rev=126281&p1=httpd/httpd/branches/2.0.x/CHANGES&r1=126280&p2=httpd/httpd/branches/2.0.x/CHANGES&r2=126281
==============================================================================
--- httpd/httpd/branches/2.0.x/CHANGES (original)
+++ httpd/httpd/branches/2.0.x/CHANGES Mon Jan 24 04:50:04 2005
@@ -1,5 +1,8 @@
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]
Modified: httpd/httpd/branches/2.0.x/STATUS
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/STATUS?view=diff&rev=126281&p1=httpd/httpd/branches/2.0.x/STATUS&r1=126280&p2=httpd/httpd/branches/2.0.x/STATUS&r2=126281
==============================================================================
--- httpd/httpd/branches/2.0.x/STATUS (original)
+++ httpd/httpd/branches/2.0.x/STATUS Mon Jan 24 04:50:04 2005
@@ -81,11 +81,6 @@
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
Modified: httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c?view=diff&rev=126281&p1=httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c&r1=126280&p2=httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c&r2=126281
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c (original)
+++ httpd/httpd/branches/2.0.x/modules/proxy/proxy_ftp.c Mon Jan 24 04:50:04 2005
@@ -1840,7 +1840,8 @@
}
/* 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;
}
Modified: httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c
Url: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c?view=diff&rev=126281&p1=httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c&r1=126280&p2=httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c&r2=126281
==============================================================================
--- httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c (original)
+++ httpd/httpd/branches/2.0.x/modules/proxy/proxy_http.c Mon Jan 24 04:50:04 2005
@@ -925,7 +925,8 @@
}
/* 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;