You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by jp...@apache.org on 2011/03/17 19:29:18 UTC
svn commit: r1082623 - in /trafficserver/traffic/tags/2.1.7: ./
proxy/http/remap/RemapPlugins.cc
Author: jplevyak
Date: Thu Mar 17 18:29:18 2011
New Revision: 1082623
URL: http://svn.apache.org/viewvc?rev=1082623&view=rev
Log:
merge to 1082602
Modified:
trafficserver/traffic/tags/2.1.7/ (props changed)
trafficserver/traffic/tags/2.1.7/proxy/http/remap/RemapPlugins.cc
Propchange: trafficserver/traffic/tags/2.1.7/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Mar 17 18:29:18 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:1082535-1082548
+/trafficserver/traffic/trunk:1082535-1082602
Modified: trafficserver/traffic/tags/2.1.7/proxy/http/remap/RemapPlugins.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/tags/2.1.7/proxy/http/remap/RemapPlugins.cc?rev=1082623&r1=1082622&r2=1082623&view=diff
==============================================================================
--- trafficserver/traffic/tags/2.1.7/proxy/http/remap/RemapPlugins.cc (original)
+++ trafficserver/traffic/tags/2.1.7/proxy/http/remap/RemapPlugins.cc Thu Mar 17 18:29:18 2011
@@ -234,7 +234,9 @@ RemapPlugins::run_single_remap()
_request_url->path_set(newPath, newPathLen);
- if (map->homePageRedirect && fromPathLen == requestPathLen) {
+ // TODO: This is horribly wrong and broken, when can this trigger??? Check
+ // above, we already return on _s->remap_redirect ...
+ if (map->homePageRedirect && fromPathLen == requestPathLen && _s->remap_redirect) {
URL redirect_url;
redirect_url.create(NULL);