svn commit: r806920 - in /httpd/httpd/trunk: CHANGES modules/proxy/mod_proxy_connect.c modules/proxy/mod_proxy_http.c

[ni...@apache.org]

Author: niq
Date: Sun Aug 23 02:00:43 2009
New Revision: 806920

URL: http://svn.apache.org/viewvc?rev=806920&view=rev
Log:
Return consistent error status for proxy unable to connect
PR 46971

Modified:
    httpd/httpd/trunk/CHANGES
    httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
    httpd/httpd/trunk/modules/proxy/mod_proxy_http.c

Modified: httpd/httpd/trunk/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/CHANGES?rev=806920&r1=806919&r2=806920&view=diff
==============================================================================
--- httpd/httpd/trunk/CHANGES [utf-8] (original)
+++ httpd/httpd/trunk/CHANGES [utf-8] Sun Aug 23 02:00:43 2009
@@ -2,6 +2,10 @@
 
 Changes with Apache 2.3.3
 
+  *) Proxy: unable to connect to a backend is SERVICE_UNAVAILABLE,
+     rather than BAD_GATEWAY or (especially) NOT_FOUND.
+     PR 46971 [evanc nortel.com]
+
   *) Various modules: Do better checking of pollset operations in order to
      avoid segmentation faults if they fail. PR 46467
      [Stefan Fritsch <sf sfritsch.de>]

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c?rev=806920&r1=806919&r2=806920&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_connect.c Sun Aug 23 02:00:43 2009
@@ -199,7 +199,7 @@
             return DECLINED;
         }
         else {
-            return HTTP_BAD_GATEWAY;
+            return HTTP_SERVICE_UNAVAILABLE;
         }
     }
 

Modified: httpd/httpd/trunk/modules/proxy/mod_proxy_http.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/mod_proxy_http.c?rev=806920&r1=806919&r2=806920&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/mod_proxy_http.c (original)
+++ httpd/httpd/trunk/modules/proxy/mod_proxy_http.c Sun Aug 23 02:00:43 2009
@@ -1972,10 +1972,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;
     }