You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by zw...@apache.org on 2011/04/26 12:04:38 UTC

svn commit: r1096710 - /trafficserver/traffic/trunk/proxy/http/HttpTransact.cc

Author: zwoop
Date: Tue Apr 26 10:04:37 2011
New Revision: 1096710

URL: http://svn.apache.org/viewvc?rev=1096710&view=rev
Log:
TS-751 Experimental TSHttpTxnCacheLookupStatusSet(HIT_STALE) calls cause a crash
Author: William Bardwell
Review: leif

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

Modified: trafficserver/traffic/trunk/proxy/http/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http/HttpTransact.cc?rev=1096710&r1=1096709&r2=1096710&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http/HttpTransact.cc Tue Apr 26 10:04:37 2011
@@ -2598,8 +2598,8 @@ HttpTransact::HandleCacheOpenReadHit(Sta
 
     if (server_up || s->stale_icp_lookup) {
       if (!s->stale_icp_lookup && s->current.server->ip == 0) {
-        ink_release_assert(s->current.request_to == PARENT_PROXY ||
-                    s->http_config_param->no_dns_forward_to_parent != 0);
+//        ink_release_assert(s->current.request_to == PARENT_PROXY ||
+//                    s->http_config_param->no_dns_forward_to_parent != 0);
 
         // Set ourselves up to handle pending revalidate issues
         //  after the PP DNS lookup
@@ -2615,6 +2615,8 @@ HttpTransact::HandleCacheOpenReadHit(Sta
         //
         if (s->current.request_to == PARENT_PROXY) {
           TRANSACT_RETURN(DNS_LOOKUP, PPDNSLookup);
+        } else if (s->current.request_to == ORIGIN_SERVER) {
+          TRANSACT_RETURN(DNS_LOOKUP, OSDNSLookup);
         } else {
           handle_parent_died(s);
           return;