svn commit: r1355175 - in /cxf/branches/2.5.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

[sergeyb]

Author: sergeyb
Date: Thu Jun 28 21:46:53 2012
New Revision: 1355175

URL: http://svn.apache.org/viewvc?rev=1355175&view=rev
Log:
Merged revisions 1355164 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/branches/2.6.x-fixes

................
  r1355164 | sergeyb | 2012-06-28 22:26:58 +0100 (Thu, 28 Jun 2012) | 9 lines
  
  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.5.x-fixes/   (props changed)
    
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1355160
  Merged /cxf/branches/2.6.x-fixes:r1355164

Propchange: cxf/branches/2.5.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1355175&r1=1355174&r2=1355175&view=diff
==============================================================================
--- 
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 (original)
+++ 
cxf/branches/2.5.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
 Thu Jun 28 21:46:53 2012
@@ -989,6 +989,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;
@@ -1744,6 +1745,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;