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 2010/10/07 19:24:02 UTC

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

Author: dkulp
Date: Thu Oct  7 17:24:02 2010
New Revision: 1005534

URL: http://svn.apache.org/viewvc?rev=1005534&view=rev
Log:
Merged revisions 1005532 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1005532 | dkulp | 2010-10-07 13:21:26 -0400 (Thu, 07 Oct 2010) | 2 lines
  
  Use an insensitive compare to find cookies as some web servers
  are returning the all strange.
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java

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

Modified: cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?rev=1005534&r1=1005533&r2=1005534&view=diff
==============================================================================
--- cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original)
+++ cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Oct  7 17:24:02 2010
@@ -2265,8 +2265,11 @@ public class HTTPConduit 
             inMessage.put(Message.ENCODING, normalizedEncoding);            
                         
             if (maintainSession) {
-                List<String> cookies = connection.getHeaderFields().get("Set-Cookie");
-                Cookie.handleSetCookie(sessionCookies, cookies);
+                for (Map.Entry<String, List<String>> h : connection.getHeaderFields().entrySet()) {
+                    if ("Set-Cookie".equalsIgnoreCase(h.getKey())) {
+                        Cookie.handleSetCookie(sessionCookies, h.getValue());
+                    }
+                }
             }
             if (responseCode != HttpURLConnection.HTTP_NOT_FOUND) {
                 in = in == null