Return-Path: Delivered-To: apmail-cxf-commits-archive@www.apache.org Received: (qmail 18267 invoked from network); 7 Oct 2010 17:24:26 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 7 Oct 2010 17:24:26 -0000 Received: (qmail 43801 invoked by uid 500); 7 Oct 2010 17:24:26 -0000 Delivered-To: apmail-cxf-commits-archive@cxf.apache.org Received: (qmail 43761 invoked by uid 500); 7 Oct 2010 17:24:26 -0000 Mailing-List: contact commits-help@cxf.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cxf.apache.org Delivered-To: mailing list commits@cxf.apache.org Received: (qmail 43754 invoked by uid 99); 7 Oct 2010 17:24:26 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Oct 2010 17:24:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 07 Oct 2010 17:24:23 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CE1B823889E2; Thu, 7 Oct 2010 17:24:02 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1005534 - in /cxf/branches/2.2.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Date: Thu, 07 Oct 2010 17:24:02 -0000 To: commits@cxf.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20101007172402.CE1B823889E2@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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 cookies = connection.getHeaderFields().get("Set-Cookie"); - Cookie.handleSetCookie(sessionCookies, cookies); + for (Map.Entry> h : connection.getHeaderFields().entrySet()) { + if ("Set-Cookie".equalsIgnoreCase(h.getKey())) { + Cookie.handleSetCookie(sessionCookies, h.getValue()); + } + } } if (responseCode != HttpURLConnection.HTTP_NOT_FOUND) { in = in == null