From: Nick Kew <niq@apache.org>
Date: Sat, 1 Sep 2007 19:45:20 +0000 (+0000)
Subject: Move error-checking to where it should be
X-Git-Tag: 2.3.0~1479
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=520afe638a2b57f918ee00887abd39d417b59e6d;p=thirdparty%2Fapache%2Fhttpd.git

Move error-checking to where it should be
Updating r571414 (patch for PR 40756) following rpluem comment


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@571863 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c
index 0c2d67076f3..f50b4cb264f 100644
--- a/modules/proxy/mod_proxy_connect.c
+++ b/modules/proxy/mod_proxy_connect.c
@@ -122,6 +122,11 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
 
     /* do a DNS lookup for the destination host */
     err = apr_sockaddr_info_get(&uri_addr, uri.hostname, APR_UNSPEC, uri.port, 0, p);
+    if (APR_SUCCESS != err) {
+	return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
+			     "DNS lookup failure for: ",
+			     uri.hostname, NULL));
+    }
 
     /* are we connecting directly, or via a proxy? */
     if (proxyname) {
@@ -136,12 +141,6 @@ static int proxy_connect_handler(request_rec *r, proxy_worker *worker,
     }
     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
          "proxy: CONNECT: connecting to remote proxy %s on port %d", connectname, connectport);
-
-    if (APR_SUCCESS != err) {
-	return ap_proxyerror(r, HTTP_BAD_GATEWAY, apr_pstrcat(p,
-			     "DNS lookup failure for: ",
-			     uri.hostname, NULL));
-    }
  
     /* check if ProxyBlock directive on this host */
     if (OK != ap_proxy_checkproxyblock(r, conf, uri_addr)) {