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 2014/01/13 19:05:55 UTC
svn commit: r1557797 - in
/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http:
client/utils/ impl/auth/ impl/client/ impl/cookie/ impl/io/
Author: olegk
Date: Mon Jan 13 18:05:55 2014
New Revision: 1557797
URL: http://svn.apache.org/r1557797
Log:
Android specific modifications of HttpClient 4.3.1
Added:
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Idn.java (props changed)
- copied unchanged from r1557767, httpcomponents/httpclient/tags/4.3.1/httpclient/src/main/java/org/apache/http/client/utils/Idn.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java
- copied, changed from r1557556, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java
- copied, changed from r1557556, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java
- copied, changed from r1557556, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java
Removed:
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/GGSSchemeBase.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/KerberosScheme.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/KerberosSchemeFactory.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/SPNegoScheme.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/SPNegoSchemeFactory.java
Modified:
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/ProxyClient.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java
httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java
Propchange: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Idn.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Idn.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Mon Jan 13 18:05:55 2014
@@ -0,0 +1,6 @@
+/httpcomponents/httpclient/branches/4.0.x/httpclient/src/main/java/org/apache/http/client/utils/Idn.java:950681-950688
+/httpcomponents/httpclient/branches/4.1.x/httpclient/src/main/java/org/apache/http/client/utils/Idn.java:1079518-1080165
+/httpcomponents/httpclient/branches/4.2.x/httpclient/src/main/java/org/apache/http/client/utils/Idn.java:1376150-1376151,1447062
+/httpcomponents/httpclient/branches/branch_4_1/httpclient/src/main/java/org/apache/http/client/utils/Idn.java:755593-811107
+/httpcomponents/httpclient/branches/conn-mgmt-redesign/httpclient/src/main/java/org/apache/http/client/utils/Idn.java:1154913-1160573
+/httpcomponents/httpclient/branches/notice-plugin-test/httpclient/src/main/java/org/apache/http/client/utils/Idn.java:1024348-1031454
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java (from r1557556, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java&r1=1557556&r2=1557797&rev=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdnHC4.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/JdkIdn.java Mon Jan 13 18:05:55 2014
@@ -37,14 +37,14 @@ import org.apache.http.annotation.Immuta
* @since 4.0
*/
@Immutable
-public class JdkIdnHC4 implements Idn {
+public class JdkIdn implements Idn {
private final Method toUnicode;
/**
*
* @throws ClassNotFoundException if java.net.IDN is not available
*/
- public JdkIdnHC4() throws ClassNotFoundException {
+ public JdkIdn() throws ClassNotFoundException {
final Class<?> clazz = Class.forName("java.net.IDN");
try {
toUnicode = clazz.getMethod("toUnicode", String.class);
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java (from r1557556, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java&r1=1557556&r2=1557797&rev=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/PunycodeHC4.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Punycode.java Mon Jan 13 18:05:55 2014
@@ -35,14 +35,14 @@ import org.apache.http.annotation.Immuta
* @since 4.0
*/
@Immutable
-public class PunycodeHC4 {
+public class Punycode {
private static final Idn impl;
static {
Idn _impl;
try {
- _impl = new JdkIdnHC4();
+ _impl = new JdkIdn();
} catch (final Exception e) {
- _impl = new Rfc3492IdnHC4();
+ _impl = new Rfc3492Idn();
}
impl = _impl;
}
Copied: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java (from r1557556, httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java)
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java?p2=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java&p1=httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java&r1=1557556&r2=1557797&rev=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492IdnHC4.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java Mon Jan 13 18:05:55 2014
@@ -36,7 +36,7 @@ import org.apache.http.annotation.Immuta
* @since 4.0
*/
@Immutable
-public class Rfc3492IdnHC4 implements Idn {
+public class Rfc3492Idn implements Idn {
private static final int base = 36;
private static final int tmin = 1;
private static final int tmax = 26;
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java?rev=1557797&r1=1557796&r2=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/BasicSchemeHC4.java Mon Jan 13 18:05:55 2014
@@ -28,7 +28,7 @@ package org.apache.http.impl.auth;
import java.nio.charset.Charset;
-import org.apache.commons.codec.binary.Base64;
+import android.util.Base64;
import org.apache.http.Consts;
import org.apache.http.Header;
import org.apache.http.HttpRequest;
@@ -53,7 +53,6 @@ import org.apache.http.util.EncodingUtil
@NotThreadSafe
public class BasicSchemeHC4 extends RFC2617SchemeHC4 {
- private final Base64 base64codec;
/** Whether the basic authentication process is complete */
private boolean complete;
@@ -62,7 +61,6 @@ public class BasicSchemeHC4 extends RFC2
*/
public BasicSchemeHC4(final Charset credentialsCharset) {
super(credentialsCharset);
- this.base64codec = new Base64();
this.complete = false;
}
@@ -77,7 +75,6 @@ public class BasicSchemeHC4 extends RFC2
@Deprecated
public BasicSchemeHC4(final ChallengeState challengeState) {
super(challengeState);
- this.base64codec = new Base64();
}
public BasicSchemeHC4() {
@@ -162,8 +159,9 @@ public class BasicSchemeHC4 extends RFC2
tmp.append(":");
tmp.append((credentials.getPassword() == null) ? "null" : credentials.getPassword());
- final byte[] base64password = base64codec.encode(
- EncodingUtils.getBytes(tmp.toString(), getCredentialsCharset(request)));
+ final byte[] base64password = Base64.encode(
+ EncodingUtils.getBytes(tmp.toString(), getCredentialsCharset(request)),
+ Base64.DEFAULT);
final CharArrayBuffer buffer = new CharArrayBuffer(32);
if (isProxy()) {
@@ -201,8 +199,9 @@ public class BasicSchemeHC4 extends RFC2
tmp.append(":");
tmp.append((credentials.getPassword() == null) ? "null" : credentials.getPassword());
- final byte[] base64password = Base64.encodeBase64(
- EncodingUtils.getBytes(tmp.toString(), charset), false);
+ final byte[] base64password = Base64.encode(
+ EncodingUtils.getBytes(tmp.toString(), charset),
+ Base64.DEFAULT);
final CharArrayBuffer buffer = new CharArrayBuffer(32);
if (proxy) {
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java?rev=1557797&r1=1557796&r2=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/auth/NTLMEngineImpl.java Mon Jan 13 18:05:55 2014
@@ -35,7 +35,7 @@ import java.util.Locale;
import javax.crypto.Cipher;
import javax.crypto.spec.SecretKeySpec;
-import org.apache.commons.codec.binary.Base64;
+import android.util.Base64;
import org.apache.http.annotation.NotThreadSafe;
import org.apache.http.util.EncodingUtils;
@@ -830,8 +830,8 @@ final class NTLMEngineImpl implements NT
/** Constructor to use when message contents are known */
NTLMMessage(final String messageBody, final int expectedType) throws NTLMEngineException {
- messageContents = Base64.decodeBase64(EncodingUtils.getBytes(messageBody,
- DEFAULT_CHARSET));
+ messageContents = Base64.decode(EncodingUtils.getBytes(messageBody,
+ DEFAULT_CHARSET), Base64.DEFAULT);
// Look for NTLM message
if (messageContents.length < SIGNATURE.length)
throw new NTLMEngineException("NTLM message decoding error - packet too short");
@@ -965,7 +965,7 @@ final class NTLMEngineImpl implements NT
} else {
resp = messageContents;
}
- return EncodingUtils.getAsciiString(Base64.encodeBase64(resp));
+ return EncodingUtils.getAsciiString(Base64.encode(resp, Base64.DEFAULT));
}
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java?rev=1557797&r1=1557796&r2=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/HttpClientBuilder.java Mon Jan 13 18:05:55 2014
@@ -83,9 +83,7 @@ import org.apache.http.impl.DefaultConne
import org.apache.http.impl.NoConnectionReuseStrategyHC4;
import org.apache.http.impl.auth.BasicSchemeFactoryHC4;
import org.apache.http.impl.auth.DigestSchemeFactoryHC4;
-import org.apache.http.impl.auth.KerberosSchemeFactory;
import org.apache.http.impl.auth.NTLMSchemeFactory;
-import org.apache.http.impl.auth.SPNegoSchemeFactory;
import org.apache.http.impl.conn.DefaultProxyRoutePlanner;
import org.apache.http.impl.conn.DefaultRoutePlanner;
import org.apache.http.impl.conn.DefaultSchemePortResolver;
@@ -909,8 +907,6 @@ public class HttpClientBuilder {
.register(AuthSchemes.BASIC, new BasicSchemeFactoryHC4())
.register(AuthSchemes.DIGEST, new DigestSchemeFactoryHC4())
.register(AuthSchemes.NTLM, new NTLMSchemeFactory())
- .register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory())
- .register(AuthSchemes.KERBEROS, new KerberosSchemeFactory())
.build();
}
Lookup<CookieSpecProvider> cookieSpecRegistry = this.cookieSpecRegistry;
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/ProxyClient.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/ProxyClient.java?rev=1557797&r1=1557796&r2=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/ProxyClient.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/client/ProxyClient.java Mon Jan 13 18:05:55 2014
@@ -58,9 +58,7 @@ import org.apache.http.impl.DefaultConne
import org.apache.http.impl.auth.BasicSchemeFactoryHC4;
import org.apache.http.impl.auth.DigestSchemeFactoryHC4;
import org.apache.http.impl.auth.HttpAuthenticator;
-import org.apache.http.impl.auth.KerberosSchemeFactory;
import org.apache.http.impl.auth.NTLMSchemeFactory;
-import org.apache.http.impl.auth.SPNegoSchemeFactory;
import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
import org.apache.http.impl.execchain.TunnelRefusedException;
import org.apache.http.message.BasicHttpRequest;
@@ -116,8 +114,6 @@ public class ProxyClient {
this.authSchemeRegistry.register(AuthSchemes.BASIC, new BasicSchemeFactoryHC4());
this.authSchemeRegistry.register(AuthSchemes.DIGEST, new DigestSchemeFactoryHC4());
this.authSchemeRegistry.register(AuthSchemes.NTLM, new NTLMSchemeFactory());
- this.authSchemeRegistry.register(AuthSchemes.SPNEGO, new SPNegoSchemeFactory());
- this.authSchemeRegistry.register(AuthSchemes.KERBEROS, new KerberosSchemeFactory());
this.reuseStrategy = new DefaultConnectionReuseStrategyHC4();
}
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java?rev=1557797&r1=1557796&r2=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilterHC4.java Mon Jan 13 18:05:55 2014
@@ -30,7 +30,7 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
-import org.apache.http.client.utils.PunycodeHC4;
+import org.apache.http.client.utils.Punycode;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieAttributeHandler;
import org.apache.http.cookie.CookieOrigin;
@@ -98,7 +98,7 @@ public class PublicSuffixFilterHC4 imple
if (domain.startsWith(".")) {
domain = domain.substring(1);
}
- domain = PunycodeHC4.toUnicode(domain);
+ domain = Punycode.toUnicode(domain);
// An exception rule takes priority over any other matching rule.
if (this.exceptions != null) {
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java?rev=1557797&r1=1557796&r2=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/AbstractMessageParserHC4.java Mon Jan 13 18:05:55 2014
@@ -76,7 +76,7 @@ public abstract class AbstractMessagePar
* @param parser the line parser.
* @param params HTTP parameters.
*
- * @deprecated (4.3) use {@link AbstractMessageParserHC4#AbstractMessageParser(SessionInputBuffer,
+ * @deprecated (4.3) use {@link AbstractMessageParserHC4#AbstractMessageParserHC4(SessionInputBuffer,
* LineParser, MessageConstraints)}
*/
@Deprecated
Modified: httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java
URL: http://svn.apache.org/viewvc/httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java?rev=1557797&r1=1557796&r2=1557797&view=diff
==============================================================================
--- httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java (original)
+++ httpcomponents/httpclient-android/branches/test-branch/src/main/java/org/apache/http/impl/io/ChunkedOutputStreamHC4.java Mon Jan 13 18:05:55 2014
@@ -67,7 +67,7 @@ public class ChunkedOutputStreamHC4 exte
* @param bufferSize The minimum chunk size (excluding last chunk)
* @throws IOException not thrown
*
- * @deprecated (4.3) use {@link ChunkedOutputStreamHC4#ChunkedOutputStream(int, SessionOutputBuffer)}
+ * @deprecated (4.3) use {@link ChunkedOutputStreamHC4#ChunkedOutputStreamHC4(int, SessionOutputBuffer)}
*/
@Deprecated
public ChunkedOutputStreamHC4(final SessionOutputBuffer out, final int bufferSize)
@@ -82,7 +82,7 @@ public class ChunkedOutputStreamHC4 exte
* @param out the output buffer to wrap
* @throws IOException not thrown
*
- * @deprecated (4.3) use {@link ChunkedOutputStreamHC4#ChunkedOutputStream(int, SessionOutputBuffer)}
+ * @deprecated (4.3) use {@link ChunkedOutputStreamHC4#ChunkedOutputStreamHC4(int, SessionOutputBuffer)}
*/
@Deprecated
public ChunkedOutputStreamHC4(final SessionOutputBuffer out)