jim at apache
Nov 19, 2009, 6:07 AM
Post #1 of 1
(142 views)
Permalink
|
|
svn commit: r882153 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/proxy/mod_proxy_connect.c modules/proxy/mod_proxy_http.c
|
|
Author: jim
Date: Thu Nov 19 14:07:46 2009
New Revision: 882153
URL: http://svn.apache.org/viewvc?rev=882153&view=rev
Log:
Merge r806920 from trunk:
Return consistent error status for proxy unable to connect
PR 46971
Submitted by: niq
Reviewed/backported 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_connect.c
httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=882153&r1=882152&r2=882153&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Nov 19 14:07:46 2009
@@ -8,6 +8,10 @@
control is still vulnerable, unless using OpenSSL >= 0.9.8l.
[Joe Orton, Ruediger Pluem]
+ *) Proxy: unable to connect to a backend is SERVICE_UNAVAILABLE,
+ rather than BAD_GATEWAY or (especially) NOT_FOUND.
+ PR 46971 [evanc nortel.com]
+
*) mod_charset_lite: Honor 'CharsetOptions NoImplicitAdd'.
[Eric Covener]
Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=882153&r1=882152&r2=882153&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Nov 19 14:07:46 2009
@@ -87,11 +87,6 @@
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * proxy: return consistent error message in case of failure to
- connect to backend.
- PR 46971
- Patch: http://svn.apache.org/viewvc?rev=806920&view=rev
- +1: niq, covener, jim
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c?rev=882153&r1=882152&r2=882153&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_connect.c Thu Nov 19 14:07:46 2009
@@ -201,7 +201,7 @@
return DECLINED;
}
else {
- return HTTP_BAD_GATEWAY;
+ return HTTP_SERVICE_UNAVAILABLE;
}
}
Modified: httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c?rev=882153&r1=882152&r2=882153&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/branches/2.2.x/modules/proxy/mod_proxy_http.c Thu Nov 19 14:07:46 2009
@@ -1974,10 +1974,7 @@
/* Step Two: Make the Connection */
if (ap_proxy_connect_backend(proxy_function, backend, worker, r->server)) {
- if (r->proxyreq == PROXYREQ_PROXY)
- status = HTTP_NOT_FOUND;
- else
- status = HTTP_SERVICE_UNAVAILABLE;
+ status = HTTP_SERVICE_UNAVAILABLE;
goto cleanup;
}
|
