From 86b40791fd1549aa438001939cd4761b5825b50b Mon Sep 17 00:00:00 2001 From: Leif Hedstrom Date: Fri, 12 Aug 2016 14:13:17 -0600 Subject: [PATCH] TS-4691 Removes a bogus assertion which can cause failure --- proxy/http/HttpTransact.cc | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/proxy/http/HttpTransact.cc b/proxy/http/HttpTransact.cc index 6a2d8670aed..f6801a4ed7e 100644 --- a/proxy/http/HttpTransact.cc +++ b/proxy/http/HttpTransact.cc @@ -1718,7 +1718,6 @@ HttpTransact::OSDNSLookup(State *s) case RETRY_EXPANDED_NAME: // expansion successful, do a dns lookup on expanded name HTTP_RELEASE_ASSERT(s->dns_info.attempts < max_dns_lookups); - HTTP_RELEASE_ASSERT(s->http_config_param->enable_url_expandomatic); TRANSACT_RETURN(SM_ACTION_DNS_LOOKUP, OSDNSLookup); break; case EXPANSION_NOT_ALLOWED: @@ -6698,9 +6697,9 @@ HttpTransact::try_to_expand_host_name(State *s) s->dns_info.lookup_name = s->arena.str_alloc(length); ink_string_concatenate_strings_n(s->dns_info.lookup_name, length + 1, "www.", s->server_info.name, ".com", NULL); } - return (RETRY_EXPANDED_NAME); + return RETRY_EXPANDED_NAME; } else { - return (DNS_ATTEMPTS_EXHAUSTED); + return DNS_ATTEMPTS_EXHAUSTED; } } else { return EXPANSION_NOT_ALLOWED;