Author: dkulp
Date: Mon Jun 20 15:07:07 2011
New Revision: 1137649
URL: http://svn.apache.org/viewvc?rev=1137649&view=rev
Log:
Merged revisions 1136942,1136953 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1136942 | dkulp | 2011-06-17 13:11:26 -0400 (Fri, 17 Jun 2011) | 1 line
Add the 307 redirect to the actual redirect code
........
r1136953 | dkulp | 2011-06-17 13:29:10 -0400 (Fri, 17 Jun 2011) | 1 line
Fix typo
........
Modified:
cxf/branches/2.4.x-fixes/ (props changed)
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1136942-1136953
Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 20 15:07:07 2011
@@ -1 +1 @@
-/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1137509
+/cxf/trunk:1-1134023,1134142,1134248,1134281,1134523,1134526,1135457,1135484,1135899,1136380,1136417,1136837,1136860,1136933,1136942-1136953,1137509
Modified:
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1137649&r1=1137648&r2=1137649&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Mon Jun 20 15:07:07 2011
@@ -956,6 +956,7 @@ public class HTTPConduit
switch(responseCode) {
case HttpURLConnection.HTTP_MOVED_PERM:
case HttpURLConnection.HTTP_MOVED_TEMP:
+ case 307:
connection = redirectRetransmit(origConnection, message,
cachedStream);
break;
case HttpURLConnection.HTTP_UNAUTHORIZED:
