From 520afe638a2b57f918ee00887abd39d417b59e6d Mon Sep 17 00:00:00 2001 From: Nick Kew Date: Sat, 1 Sep 2007 19:45:20 +0000 Subject: [PATCH] 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 --- modules/proxy/mod_proxy_connect.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/modules/proxy/mod_proxy_connect.c b/modules/proxy/mod_proxy_connect.c index 0c2d67076f..f50b4cb264 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)) { -- 2.40.0