cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dk...@apache.org
Subject svn commit: r1537258 - in /cxf/trunk: parent/pom.xml rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
Date Wed, 30 Oct 2013 19:54:44 GMT
Author: dkulp
Date: Wed Oct 30 19:54:44 2013
New Revision: 1537258

URL: http://svn.apache.org/r1537258
Log:
http async client is released

Modified:
    cxf/trunk/parent/pom.xml
    cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
    cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java

Modified: cxf/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/parent/pom.xml?rev=1537258&r1=1537257&r2=1537258&view=diff
==============================================================================
--- cxf/trunk/parent/pom.xml (original)
+++ cxf/trunk/parent/pom.xml Wed Oct 30 19:54:44 2013
@@ -90,8 +90,8 @@
         <cxf.ehcache.version>2.7.4</cxf.ehcache.version>
         <cxf.fastinfoset.bundle.version>1.2.7_4</cxf.fastinfoset.bundle.version>
         <cxf.hazelcast.version>1.9.4</cxf.hazelcast.version>
-        <cxf.httpcomponents.asyncclient.version>4.0-beta5-SNAPSHOT</cxf.httpcomponents.asyncclient.version>
-        <cxf.httpcomponents.asyncclient.version.range>[4.0-beta4,4.1)</cxf.httpcomponents.asyncclient.version.range>
+        <cxf.httpcomponents.asyncclient.version>4.0</cxf.httpcomponents.asyncclient.version>
+        <cxf.httpcomponents.asyncclient.version.range>[4.0,4.1)</cxf.httpcomponents.asyncclient.version.range>
         <cxf.httpcomponents.client.version>4.3.1</cxf.httpcomponents.client.version>
         <cxf.httpcomponents.core.version>4.3</cxf.httpcomponents.core.version>
         <cxf.httpcomponents.core.version.range>[4.3,4.4.0)</cxf.httpcomponents.core.version.range>

Modified: cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java?rev=1537258&r1=1537257&r2=1537258&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
(original)
+++ cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/http/auth/DigestAuthSupplier.java
Wed Oct 30 19:54:44 2013
@@ -144,7 +144,6 @@ public class DigestAuthSupplier implemen
                 MessageDigest digester = MessageDigest.getInstance(digAlg);
                 String a1 = username + ":" + realm + ":" + password;
                 if ("MD5-sess".equalsIgnoreCase(algorithm)) {
-                    algorithm = "MD5";
                     String tmp2 = encode(digester.digest(a1.getBytes(charset)));
                     a1 = tmp2 + ':' + nonce + ':' + cnonce;
                 }
@@ -171,6 +170,7 @@ public class DigestAuthSupplier implemen
                 outParams.put("nc", ncstring);
                 outParams.put("cnonce", cnonce);
                 outParams.put("response", response);
+                outParams.put("algorithm", algorithm);
                 return new HttpAuthHeader(HttpAuthHeader.AUTH_TYPE_DIGEST, outParams).getFullHeader();
             } catch (Exception ex) {
                 throw new RuntimeException(ex);

Modified: cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java?rev=1537258&r1=1537257&r2=1537258&view=diff
==============================================================================
--- cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
(original)
+++ cxf/trunk/rt/transports/http/src/test/java/org/apache/cxf/transport/http/auth/DigestAuthSupplierTest.java
Wed Oct 30 19:54:44 2013
@@ -91,6 +91,7 @@ public class DigestAuthSupplierTest {
         expectedParams.put("realm", "MyCompany realm.");
         expectedParams.put("qop", "auth");
         expectedParams.put("uri", "");
+        expectedParams.put("algorithm", "MD5");
         assertEquals(expectedParams, params);
         control.verify();
     }



Mime
View raw message