You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2011/06/17 19:11:25 UTC
svn commit: r1136941 - in /cxf/branches/2.3.x-fixes: ./
rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Author: dkulp
Date: Fri Jun 17 17:11:25 2011
New Revision: 1136941
URL: http://svn.apache.org/viewvc?rev=1136941&view=rev
Log:
Merged revisions 1136935 via svnmerge from
https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................
r1136935 | dkulp | 2011-06-17 13:00:21 -0400 (Fri, 17 Jun 2011) | 9 lines
Merged revisions 1136837 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1136837 | cschneider | 2011-06-17 06:26:29 -0400 (Fri, 17 Jun 2011) | 1 line
Adding support for 307 redirects like discussed on the list
........
................
Modified:
cxf/branches/2.3.x-fixes/ (props changed)
cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Propchange: cxf/branches/2.3.x-fixes/
('svn:mergeinfo' removed)
Propchange: cxf/branches/2.3.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1136941&r1=1136940&r2=1136941&view=diff
==============================================================================
--- cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.3.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Fri Jun 17 17:11:25 2011
@@ -1490,6 +1490,7 @@ public class HTTPConduit
switch(responseCode) {
case HttpURLConnection.HTTP_MOVED_PERM:
case HttpURLConnection.HTTP_MOVED_TEMP:
+ case 307:
connection =
redirectRetransmit(connection, message, cachedStream);
break;
@@ -2067,6 +2068,7 @@ public class HTTPConduit
switch (e.responseCode()) {
case HttpURLConnection.HTTP_MOVED_PERM: // 301
case HttpURLConnection.HTTP_MOVED_TEMP: // 302
+ case 307: // 307
msg += " that returned location header '" + e.getLocation() + "'";
break;
case HttpURLConnection.HTTP_UNAUTHORIZED: // 401