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 0c2d67076f31cf236eae20da0f8588aa4c78405a..f50b4cb264fe90cfad18000f6d289be0485fe55b 100644 (file)
--- 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)) {