You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2006/08/28 18:34:40 UTC
svn commit: r437748 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
modules/proxy/mod_proxy_ajp.c
Author: jim
Date: Mon Aug 28 09:34:40 2006
New Revision: 437748
URL: http://svn.apache.org/viewvc?rev=437748&view=rev
Log:
Merge r434483 from trunk:
* Close connection to backend if reading of request body fails.
PR: 40310
Submitted by: Ian Abel <ianabel mxtelecom.com>
Reviewed by: rpluem
Submitted by: rpluem
Reviewed by: jim
Modified:
httpd/httpd/branches/2.2.x/CHANGES
httpd/httpd/branches/2.2.x/STATUS
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=437748&r1=437747&r2=437748&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Aug 28 09:34:40 2006
@@ -1,6 +1,9 @@
-*- coding: utf-8 -*-
Changes with Apache 2.2.4
+ *) mod_proxy_ajp: Close connection to backend if reading of request body
+ fails. PR 40310. [Ian Abel <ianabel mxtelecom.com>]
+
*) mod_proxy_balancer: Retry worker chosen by route / redirect worker if
it is in error state before sending "Service Temporarily Unavailable".
PR 38962. [Christian Boitel <cboitel lfdj.com>]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=437748&r1=437747&r2=437748&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Mon Aug 28 09:34:40 2006
@@ -86,15 +86,6 @@
http://people.apache.org/~wrowe/mod_isapi-416293-to-httpd-2.2.patch
+1 wrowe , fielding, jerenkrantz
- * mod_proxy_ajp: Close connection to backend if reading of request body
- fails.
- PR: 40310
- Trunk version of patch:
- http://svn.apache.org/viewvc?view=rev&revision=434483
- 2.2.x version of patch:
- Trunk version works
- +1 rpluem, sctemme, jim, mturk
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
* mpm_winnt: Fix return values from wait_for_many_objects.
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c?rev=437748&r1=437747&r2=437748&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_ajp.c Mon Aug 28 09:34:40 2006
@@ -175,6 +175,8 @@
AJP13_MAX_SEND_BODY_SZ);
if (status != APR_SUCCESS) {
+ /* We had a failure: Close connection to backend */
+ conn->close++;
ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
"proxy: ap_get_brigade failed");
apr_brigade_destroy(input_brigade);