svn commit: r1235807 - in /trafficserver/traffic/trunk: CHANGES proxy/http/HttpSM.cc proxy/http/HttpTransact.cc

[zw...@apache.org]

Author: zwoop
Date: Wed Jan 25 16:20:27 2012
New Revision: 1235807

URL: http://svn.apache.org/viewvc?rev=1235807&view=rev
Log:
TS-1073 no_dns_just_forward_to_parent configuration parameter is ignored/not used.
Author: Kevin Giles.
Review and minor changes: leif

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/proxy/http/HttpSM.cc
    trafficserver/traffic/trunk/proxy/http/HttpTransact.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=1235807&r1=1235806&r2=1235807&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Wed Jan 25 16:20:27 2012
@@ -1,5 +1,8 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache Traffic Server 3.1.2
+  *) [TS-1073] no_dns_just_forward_to_parent configuration parameter is
+   ignored/not used. Author: Kevin Giles.
+
   *) [TS-996] HTTPHdr::m_host goes stale if HdrHeap::evacuate_from_str_heaps
    is called. Author: B. Wyatt.
 

Modified: trafficserver/traffic/trunk/proxy/http/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpSM.cc?rev=1235807&r1=1235806&r2=1235807&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpSM.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpSM.cc Wed Jan 25 16:20:27 2012
@@ -6409,6 +6409,15 @@ HttpSM::set_next_state()
         Debug("dns", "[HttpTransact::HandleRequest] Skipping DNS lookup, provided by plugin");
         call_transact_and_set_next_state(NULL);
         break;
+      } else if (t_state.dns_info.looking_up == HttpTransact::ORIGIN_SERVER &&
+                 t_state.http_config_param->no_dns_forward_to_parent){
+
+        if (t_state.cop_test_page)
+          ink_inet_copy(t_state.host_db_info.ip(), t_state.state_machine->ua_session->get_netvc()->get_local_addr());
+
+        t_state.dns_info.lookup_success = true;
+        call_transact_and_set_next_state(NULL);
+        break;
       }
 
       HTTP_SM_SET_DEFAULT_HANDLER(&HttpSM::state_hostdb_lookup);

Modified: trafficserver/traffic/trunk/proxy/http/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTransact.cc?rev=1235807&r1=1235806&r2=1235807&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTransact.cc Wed Jan 25 16:20:27 2012
@@ -1641,7 +1641,8 @@ HttpTransact::OSDNSLookup(State* s)
   } else if (s->dns_info.lookup_name[0] <= '9' &&
              s->dns_info.lookup_name[0] >= '0' &&
              //(s->state_machine->authAdapter.needs_rev_dns() ||
-             ( host_rule_in_CacheControlTable() || s->parent_params->ParentTable->hostMatch)) {
+             (host_rule_in_CacheControlTable() || s->parent_params->ParentTable->hostMatch) &&
+             !s->http_config_param->no_dns_forward_to_parent) {
     // note, broken logic: ACC fudges the OR stmt to always be true,
     // 'AuthHttpAdapter' should do the rev-dns if needed, not here .
     TRANSACT_RETURN(REVERSE_DNS_LOOKUP, HttpTransact::StartAccessControl);