You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by ol...@apache.org on 2013/01/25 14:19:23 UTC
svn commit: r1438495 - in /httpcomponents/httpclient/trunk: RELEASE_NOTES.txt
httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
Author: olegk
Date: Fri Jan 25 13:19:23 2013
New Revision: 1438495
URL: http://svn.apache.org/viewvc?rev=1438495&view=rev
Log:
HTTPCLIENT-1305: Ensure chunking is disabled when applying Base64 encoding
Modified:
httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
Modified: httpcomponents/httpclient/trunk/RELEASE_NOTES.txt
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/RELEASE_NOTES.txt?rev=1438495&r1=1438494&r2=1438495&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/RELEASE_NOTES.txt (original)
+++ httpcomponents/httpclient/trunk/RELEASE_NOTES.txt Fri Jan 25 13:19:23 2013
@@ -1,6 +1,9 @@
Changes since 4.3 ALPHA1
-------------------
+* [HTTPCLIENT-1305] Ensure chunking is disabled when applying Base64 encoding.
+ Contributed by Oleg Kalnichevski <olegk at apache.org>
+
* [HTTPCLIENT-1298] Add AsynchronousValidator in HttpClientBuilder's list of closeable objects.
Contributed by Martin Meinhold <mmeinhold at atlassian.com>
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java?rev=1438495&r1=1438494&r2=1438495&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/BasicScheme.java Fri Jan 25 13:19:23 2013
@@ -200,7 +200,7 @@ public class BasicScheme extends RFC2617
tmp.append((credentials.getPassword() == null) ? "null" : credentials.getPassword());
final byte[] base64password = Base64.encodeBase64(
- EncodingUtils.getBytes(tmp.toString(), charset));
+ EncodingUtils.getBytes(tmp.toString(), charset), false);
final CharArrayBuffer buffer = new CharArrayBuffer(32);
if (proxy) {
Modified: httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java?rev=1438495&r1=1438494&r2=1438495&view=diff
==============================================================================
--- httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java (original)
+++ httpcomponents/httpclient/trunk/httpclient/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java Fri Jan 25 13:19:23 2013
@@ -65,7 +65,6 @@ public abstract class GGSSchemeBase exte
private final Log log = LogFactory.getLog(getClass());
private final boolean stripPort;
- private final Base64 base64codec;
/** Authentication process state */
private State state;
@@ -75,7 +74,6 @@ public abstract class GGSSchemeBase exte
GGSSchemeBase(final boolean stripPort) {
super();
- this.base64codec = new Base64();
this.state = State.UNINITIATED;
this.stripPort = stripPort;
}
@@ -176,7 +174,7 @@ public abstract class GGSSchemeBase exte
throw new AuthenticationException(gsse.getMessage());
}
case TOKEN_GENERATED:
- final String tokenstr = new String(base64codec.encode(token));
+ final String tokenstr = new String(Base64.encodeBase64(token, false));
if (log.isDebugEnabled()) {
log.debug("Sending response '" + tokenstr + "' back to the auth server");
}
@@ -203,7 +201,7 @@ public abstract class GGSSchemeBase exte
log.debug("Received challenge '" + challenge + "' from the auth server");
}
if (state == State.UNINITIATED) {
- token = base64codec.decode(challenge.getBytes());
+ token = Base64.decodeBase64(challenge.getBytes());
state = State.CHALLENGE_RECEIVED;
} else {
log.debug("Authentication already attempted");