Return-Path: Delivered-To: apmail-incubator-cxf-commits-archive@locus.apache.org Received: (qmail 43284 invoked from network); 26 Jul 2007 21:55:50 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 26 Jul 2007 21:55:50 -0000 Received: (qmail 66645 invoked by uid 500); 26 Jul 2007 21:55:51 -0000 Delivered-To: apmail-incubator-cxf-commits-archive@incubator.apache.org Received: (qmail 66598 invoked by uid 500); 26 Jul 2007 21:55:51 -0000 Mailing-List: contact cxf-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: cxf-dev@incubator.apache.org Delivered-To: mailing list cxf-commits@incubator.apache.org Received: (qmail 66589 invoked by uid 99); 26 Jul 2007 21:55:50 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2007 14:55:50 -0700 X-ASF-Spam-Status: No, hits=-99.5 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Jul 2007 14:55:49 -0700 Received: by eris.apache.org (Postfix, from userid 65534) id F2FB71A981A; Thu, 26 Jul 2007 14:55:28 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r560013 - /incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Date: Thu, 26 Jul 2007 21:55:28 -0000 To: cxf-commits@incubator.apache.org From: dkulp@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070726215528.F2FB71A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: dkulp Date: Thu Jul 26 14:55:27 2007 New Revision: 560013 URL: http://svn.apache.org/viewvc?view=rev&rev=560013 Log: Fix adding Authorization header twice Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Modified: incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java URL: http://svn.apache.org/viewvc/incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java?view=diff&rev=560013&r1=560012&r2=560013 ============================================================================== --- incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java (original) +++ incubator/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HTTPConduit.java Thu Jul 26 14:55:27 2007 @@ -476,7 +476,7 @@ getProxy(clientSidePolicy), currentURL); connection.setDoOutput(true); - //TODO using Message context to deceided HTTP send properties + //TODO using Message context to decided HTTP send properties connection.setConnectTimeout((int)clientSidePolicy.getConnectionTimeout()); connection.setReadTimeout((int)clientSidePolicy.getReceiveTimeout()); @@ -780,13 +780,6 @@ List headerList = headers.get(header); for (String value : headerList) { connection.addRequestProperty(header, value); - String v = connection.getRequestProperty(header); - if (null == v) { - connection.addRequestProperty(header, value); - } else { - LOG.fine("Not adding request property: " + header + ", value: " + value - + ", already set to: " + v); - } } } } @@ -1131,6 +1124,8 @@ if (policy.isSetAccept()) { headers.put("Accept", Arrays.asList(new String[] {policy.getAccept()})); + } else { + headers.put("Accept", Arrays.asList(new String[] {"*"})); } if (policy.isSetAcceptEncoding()) { headers.put("Accept-Encoding",