Author: sergeyb
Date: Thu Jun 28 21:26:58 2012
New Revision: 1355164
URL: http://svn.apache.org/viewvc?rev=1355164&view=rev
Log:
Merged revisions 1355160 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1355160 | sergeyb | 2012-06-28 22:22:52 +0100 (Thu, 28 Jun 2012) | 1 line
[CXF-4398] Updating HTTPConduit to check 303, patch from Fred B applied
........
Modified:
cxf/branches/2.6.x-fixes/ (props changed)
cxf/branches/2.6.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
svn:mergeinfo = /cxf/trunk:1355160
Propchange: cxf/branches/2.6.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
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=1355164&r1=1355163&r2=1355164&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
Thu Jun 28 21:26:58 2012
@@ -1008,6 +1008,7 @@ public class HTTPConduit
switch(responseCode) {
case HttpURLConnection.HTTP_MOVED_PERM:
case HttpURLConnection.HTTP_MOVED_TEMP:
+ case HttpURLConnection.HTTP_SEE_OTHER:
case 307:
connection = redirectRetransmit(origConnection, message,
cachedStream);
break;
@@ -1760,6 +1761,7 @@ public class HTTPConduit
switch (e.responseCode()) {
case HttpURLConnection.HTTP_MOVED_PERM: // 301
case HttpURLConnection.HTTP_MOVED_TEMP: // 302
+ case HttpURLConnection.HTTP_SEE_OTHER: // 303
case 307:
msg += " that returned location header '" + e.getLocation() + "'";
break;