svn commit: r992525 - in /trafficserver/traffic/trunk: CHANGES proxy/http2/HttpTransact.cc proxy/http2/remap/RemapProcessor.cc

[am...@apache.org]

Author: amc
Date: Sat Sep  4 03:33:42 2010
New Revision: 992525

URL: http://svn.apache.org/viewvc?rev=992525&view=rev
Log:
Improved fix for TS-433.

Modified:
    trafficserver/traffic/trunk/CHANGES
    trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
    trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc

Modified: trafficserver/traffic/trunk/CHANGES
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/CHANGES?rev=992525&r1=992524&r2=992525&view=diff
==============================================================================
--- trafficserver/traffic/trunk/CHANGES (original)
+++ trafficserver/traffic/trunk/CHANGES Sat Sep  4 03:33:42 2010
@@ -8,6 +8,8 @@ Changes with Apache Traffic Server 2.1.3
   *) TS fails to use user ID with user name longer than 8 characters
    [TS-420].
 
+  *) Forward transparency is available on Linux kernels with TPROXY. [TS-291]
+
 
 Changes with Apache Traffic Server 2.1.2
 

Modified: trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc?rev=992525&r1=992524&r2=992525&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/HttpTransact.cc Sat Sep  4 03:33:42 2010
@@ -5931,8 +5931,6 @@ void
 HttpTransact::initialize_state_variables_from_request(State * s, HTTPHdr * obsolete_incoming_request)
 {
   HTTPHdr* incoming_request = &(s->hdr_info.client_request);
-  // TEMP FIX: see TS-433
-  incoming_request->mark_target_dirty();
 
   // Temporary, until we're confident that the second argument is redundant.
   ink_assert(incoming_request == obsolete_incoming_request);

Modified: trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc
URL: http://svn.apache.org/viewvc/trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc?rev=992525&r1=992524&r2=992525&view=diff
==============================================================================
--- trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc (original)
+++ trafficserver/traffic/trunk/proxy/http2/remap/RemapProcessor.cc Sat Sep  4 03:33:42 2010
@@ -113,7 +113,9 @@ RemapProcessor::setup_for_remap(HttpTran
     }
   }
 
-  if (!mapping_found) {
+  if (mapping_found) {
+    request_header->mark_target_dirty();
+  } else {
     Debug("url_rewrite", "RemapProcessor::setup_for_remap did not find a mapping");
   }