trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From iga...@apache.org
Subject svn commit: r1159821 - in /trafficserver/traffic/branches/3.0.x: ./ CHANGES STATUS proxy/http/HttpSM.cc
Date Sat, 20 Aug 2011 00:19:09 GMT
Author: igalic
Date: Sat Aug 20 00:19:08 2011
New Revision: 1159821

URL: http://svn.apache.org/viewvc?rev=1159821&view=rev
Log:
Backport TS-859

Modified:
    trafficserver/traffic/branches/3.0.x/   (props changed)
    trafficserver/traffic/branches/3.0.x/CHANGES
    trafficserver/traffic/branches/3.0.x/STATUS
    trafficserver/traffic/branches/3.0.x/proxy/http/HttpSM.cc

Propchange: trafficserver/traffic/branches/3.0.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Aug 20 00:19:08 2011
@@ -1,4 +1,4 @@
 /incubator/trafficserver/traffic/branches/dev:891823-915885
 /trafficserver/traffic/branches/ts-291:965529-991993
 /trafficserver/traffic/branches/wccp:1021790-1040544
-/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414
+/trafficserver/traffic/trunk:1129268,1131080,1131473,1133066,1133071,1133639,1135769-1135770,1136958,1137111,1137775,1137844,1137846,1142523,1143116,1144094,1144096,1144746,1146414,1153236

Modified: trafficserver/traffic/branches/3.0.x/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/CHANGES?rev=1159821&r1=1159820&r2=1159821&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/CHANGES (original)
+++ trafficserver/traffic/branches/3.0.x/CHANGES Sat Aug 20 00:19:08 2011
@@ -1,6 +1,8 @@
                                                          -*- coding: utf-8 -*-
 
 Changes with Apache Traffic Server 3.0.1
+  *) [TS-859] ATS requesting to origin instead to the parent server
+
   *) [TS-842] remove uninstall target from build system
 
   *) [TS-868] build fails with --as-needed. Author: Ilya Barygin.

Modified: trafficserver/traffic/branches/3.0.x/STATUS
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/STATUS?rev=1159821&r1=1159820&r2=1159821&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/STATUS (original)
+++ trafficserver/traffic/branches/3.0.x/STATUS Sat Aug 20 00:19:08 2011
@@ -52,11 +52,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
    Jira: https://issues.apache.org/jira/browse/TS-730
    +1: igalic, zwoop
 
-  *) HTTP: ATS requesting to origin instead to the parent server
-   Trunk patches: http://svn.apache.org/viewvc?view=rev&revision=1153236
-   Jira: https://issues.apache.org/jira/browse/TS-859
-   +1: zwoop, zym, igalic
-
   *) HTTP: We do not honor / use the configuration option for
      proxy.config.http.forward.proxy_auth_to_parent.
    Trunk patch: http://svn.apache.org/viewvc?view=rev&revision=1154744

Modified: trafficserver/traffic/branches/3.0.x/proxy/http/HttpSM.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/branches/3.0.x/proxy/http/HttpSM.cc?rev=1159821&r1=1159820&r2=1159821&view=diff
==============================================================================
--- trafficserver/traffic/branches/3.0.x/proxy/http/HttpSM.cc (original)
+++ trafficserver/traffic/branches/3.0.x/proxy/http/HttpSM.cc Sat Aug 20 00:19:08 2011
@@ -6406,7 +6406,8 @@ HttpSM::set_next_state()
         t_state.dns_info.lookup_success = true;
         call_transact_and_set_next_state(NULL);
         break;
-      } else if (t_state.dns_info.lookup_success) { // Already set, from a plugin presumably
+      } else if (t_state.parent_result.r == PARENT_UNDEFINED && t_state.dns_info.lookup_success)
{
+        // Already set, and we don't have a parent proxy to lookup
         ink_assert(t_state.host_db_info.ip());
         Debug("dns", "[HttpTransact::HandleRequest] Skipping DNS lookup, provided by plugin");
         call_transact_and_set_next_state(NULL);



Mime
View raw message