www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-07 04:02:58 +03:00
Code Activity

Return consistent error status for proxy unable to connect

Browse Source 
PR 46971


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@806920 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Kew
2009-08-23 02:00:43 +00:00
parent fadce7cbef
commit 93cdac913c
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -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>]

2
modules/proxy/mod_proxy_connect.c
View File

@@ -199,7 +199,7 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
return DECLINED;
}
else {
return HTTP_BAD_GATEWAY;
return HTTP_SERVICE_UNAVAILABLE;
}
}

5
modules/proxy/mod_proxy_http.c
View File

@@ -1972,10 +1972,7 @@ static int proxy_http_handler(request_rec *r, proxy_worker *worker,
/* 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;
}