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 2010/02/18 22:10:04 UTC

svn commit: r911588 - in /incubator/trafficserver/traffic/trunk/proxy/http2: HttpTransact.cc remap/RemapPlugins.cc remap/UrlRewrite.cc

Author: zwoop
Date: Thu Feb 18 21:10:04 2010
New Revision: 911588

URL: http://svn.apache.org/viewvc?rev=911588&view=rev
Log:
TS-184: Host header/cache lookup entry doesn't match remap.config perfectly
	Author: Manjesh Nilange
	Review: Leif

Modified:
    incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
    incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc
    incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=911588&r1=911587&r2=911588&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Thu Feb 18 21:10:04 2010
@@ -2005,17 +2005,16 @@
                                                                     MIME_LEN_HOST, &host_len);
         if (host_hdr) {
           char *tmp;
+          int port = 0;
           tmp = (char *) memchr(host_hdr, ':', host_len);
           if (tmp) {
             s->cache_info.lookup_url->host_set(host_hdr, (tmp - host_hdr));
 
-            int port = ink_atoi(tmp + 1, host_len - (tmp + 1 - host_hdr));
-            if (port != 0) {
-              s->cache_info.lookup_url->port_set(port);
-            }
+            port = ink_atoi(tmp + 1, host_len - (tmp + 1 - host_hdr));
           } else {
             s->cache_info.lookup_url->host_set(host_hdr, host_len);
           }
+          s->cache_info.lookup_url->port_set(port);
         }
       }
       HTTP_DEBUG_ASSERT(s->cache_info.lookup_url->valid() == true);

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc?rev=911588&r1=911587&r2=911588&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/remap/RemapPlugins.cc Thu Feb 18 21:10:04 2010
@@ -410,7 +410,7 @@
     _request_url->host_set(toHost, toHostLen);
   }
 
-  if (!plugin_modified_port && (requestPort != map_to->port_get()))
+  if (!plugin_modified_port)
     _request_url->port_set(map_to->port_get_raw());
 
   // Extra byte is potentially needed for prefix path '/'.

Modified: incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc
URL: http://svn.apache.org/viewvc/incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc?rev=911588&r1=911587&r2=911588&view=diff
==============================================================================
--- incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc (original)
+++ incubator/trafficserver/traffic/trunk/proxy/http2/remap/UrlRewrite.cc Thu Feb 18 21:10:04 2010
@@ -846,10 +846,8 @@
   if (!plugin_modified_host)
     request_url->host_set(toHost, toHostLen);
 
-  if (!plugin_modified_port && 
-      ((requestPort != map_to->port_get()) || map_to->port_get_raw())) {
+  if (!plugin_modified_port)
     request_url->port_set(map_to->port_get_raw());
-  }
 
   // Extra byte is potentially needed for prefix path '/'.
   // Added an extra 3 so that TS wouldn't crash in the field.