Author: dkulp
Date: Tue Mar 26 20:53:21 2013
New Revision: 1461310

URL: http://svn.apache.org/r1461310
Log:
Merged revisions 1461287 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1461287 | dkulp | 2013-03-26 15:53:53 -0400 (Tue, 26 Mar 2013) | 2 lines

  [CXF-4918] Try to detect a redirect (if enabled) and set the appropriate URL

........


Conflicts:
        
rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified:
    
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Modified: 
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1461310&r1=1461309&r2=1461310&view=diff
==============================================================================
--- 
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 (original)
+++ 
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 Tue Mar 26 20:53:21 2013
@@ -1128,6 +1128,7 @@ public class HTTPConduit 
         connection.setReadTimeout((int)cp.getReceiveTimeout());
         connection.setUseCaches(false);
         connection.setInstanceFollowRedirects(false);
+        message.put("http.retransmit.url", newURL.toString());
 
         // If the HTTP_REQUEST_METHOD is not set, the default is "POST".
         String httpRequestMethod = 
(String)message.get(Message.HTTP_REQUEST_METHOD);


Reply via email to