From 9ca4ef79eec8ee341cec0257901a0097d9ff3b99 Mon Sep 17 00:00:00 2001 From: Sebastian Bazley Date: Sun, 15 Feb 2009 16:34:53 +0000 Subject: [PATCH] Remove @author tags; fix some SVN properties git-svn-id: https://svn.apache.org/repos/asf/httpcomponents/httpclient/trunk@744689 13f79535-47bb-0310-9956-ffa450edef68 --- .../examples/client/ClientExecuteDirect.java | 1 - .../examples/client/ClientExecuteProxy.java | 1 - .../client/ClientMultiThreadedExecution.java | 1 - .../examples/conn/ManagerConnectDirect.java | 1 - .../examples/conn/ManagerConnectProxy.java | 1 - .../examples/conn/OperatorConnectDirect.java | 1 - .../examples/conn/OperatorConnectProxy.java | 1 - .../main/java/org/apache/http/auth/AUTH.java | 1 - .../java/org/apache/http/auth/AuthScheme.java | 2 - .../apache/http/auth/AuthSchemeFactory.java | 1 - .../apache/http/auth/AuthSchemeRegistry.java | 1 - .../java/org/apache/http/auth/AuthScope.java | 2 - .../java/org/apache/http/auth/AuthState.java | 1 - .../http/auth/AuthenticationException.java | 1 - .../apache/http/auth/BasicUserPrincipal.java | 1 - .../org/apache/http/auth/Credentials.java | 2 - .../auth/InvalidCredentialsException.java | 1 - .../auth/MalformedChallengeException.java | 1 - .../org/apache/http/auth/NTCredentials.java | 3 - .../org/apache/http/auth/NTUserPrincipal.java | 1 - .../auth/UsernamePasswordCredentials.java | 4 - .../apache/http/auth/params/AuthParams.java | 1 - .../http/client/AuthenticationHandler.java | 1 - .../client/CircularRedirectException.java | 1 - .../org/apache/http/client/CookieStore.java | 1 - .../http/client/CredentialsProvider.java | 1 - .../org/apache/http/client/HttpClient.java | 1 - .../http/client/HttpRequestRetryHandler.java | 2 - .../client/NonRepeatableRequestException.java | 1 - .../apache/http/client/RedirectException.java | 1 - .../apache/http/client/RedirectHandler.java | 1 - .../apache/http/client/RequestDirector.java | 1 - .../apache/http/client/ResponseHandler.java | 1 - .../apache/http/client/UserTokenHandler.java | 7 +- .../client/methods/AbortableHttpRequest.java | 1 - .../HttpEntityEnclosingRequestBase.java | 1 - .../http/client/methods/HttpRequestBase.java | 1 - .../http/client/methods/HttpUriRequest.java | 1 - .../http/client/params/HttpClientParams.java | 1 - .../client/protocol/RequestAddCookies.java | 1 - .../protocol/RequestDefaultHeaders.java | 1 - .../protocol/RequestProxyAuthentication.java | 1 - .../protocol/RequestTargetAuthentication.java | 1 - .../protocol/ResponseProcessCookies.java | 1 - .../org/apache/http/client/utils/Idn.java | 86 +++---- .../org/apache/http/client/utils/JdkIdn.java | 138 +++++----- .../apache/http/client/utils/Punycode.java | 108 ++++---- .../apache/http/client/utils/Rfc3492Idn.java | 240 ++++++++--------- .../http/conn/BasicEofSensorWatcher.java | 1 - .../apache/http/conn/BasicManagedEntity.java | 1 - .../http/conn/ClientConnectionManager.java | 4 - .../conn/ClientConnectionManagerFactory.java | 1 - .../http/conn/ClientConnectionOperator.java | 1 - .../http/conn/ConnectTimeoutException.java | 1 - .../conn/ConnectionKeepAliveStrategy.java | 1 - .../conn/ConnectionPoolTimeoutException.java | 1 - .../http/conn/ConnectionReleaseTrigger.java | 1 - .../http/conn/EofSensorInputStream.java | 4 - .../apache/http/conn/EofSensorWatcher.java | 1 - .../http/conn/ManagedClientConnection.java | 1 - .../http/conn/OperatedClientConnection.java | 1 - .../http/conn/params/ConnManagerParams.java | 2 - .../apache/http/conn/params/ConnPerRoute.java | 1 - .../http/conn/params/ConnPerRouteBean.java | 1 - .../http/conn/params/ConnRouteParams.java | 2 - .../http/conn/routing/BasicRouteDirector.java | 1 - .../apache/http/conn/routing/HttpRoute.java | 1 - .../http/conn/routing/HttpRouteDirector.java | 1 - .../apache/http/conn/routing/RouteInfo.java | 1 - .../http/conn/routing/RouteTracker.java | 1 - .../conn/scheme/LayeredSocketFactory.java | 2 - .../http/conn/scheme/PlainSocketFactory.java | 2 - .../org/apache/http/conn/scheme/Scheme.java | 4 - .../http/conn/scheme/SchemeRegistry.java | 1 - .../http/conn/scheme/SocketFactory.java | 3 - .../http/conn/ssl/AbstractVerifier.java | 1 - .../conn/ssl/AllowAllHostnameVerifier.java | 1 - .../ssl/BrowserCompatHostnameVerifier.java | 1 - .../http/conn/ssl/SSLSocketFactory.java | 2 - .../http/conn/ssl/StrictHostnameVerifier.java | 1 - .../http/conn/ssl/X509HostnameVerifier.java | 2 - .../org/apache/http/cookie/ClientCookie.java | 1 - .../java/org/apache/http/cookie/Cookie.java | 1 - .../http/cookie/CookieAttributeHandler.java | 1 - .../http/cookie/CookieIdentityComparator.java | 1 - .../org/apache/http/cookie/CookieOrigin.java | 1 - .../http/cookie/CookiePathComparator.java | 1 - .../org/apache/http/cookie/CookieSpec.java | 2 - .../apache/http/cookie/CookieSpecFactory.java | 1 - .../http/cookie/CookieSpecRegistry.java | 2 - .../http/cookie/MalformedCookieException.java | 1 - .../main/java/org/apache/http/cookie/SM.java | 1 - .../org/apache/http/cookie/SetCookie.java | 1 - .../org/apache/http/cookie/SetCookie2.java | 1 - .../http/cookie/params/CookieSpecPNames.java | 1 - .../apache/http/impl/auth/AuthSchemeBase.java | 1 - .../apache/http/impl/auth/BasicScheme.java | 8 - .../http/impl/auth/BasicSchemeFactory.java | 1 - .../apache/http/impl/auth/DigestScheme.java | 8 - .../http/impl/auth/DigestSchemeFactory.java | 1 - .../org/apache/http/impl/auth/NTLMEngine.java | 1 - .../http/impl/auth/NTLMEngineException.java | 1 - .../apache/http/impl/auth/RFC2617Scheme.java | 1 - .../UnsupportedDigestAlgorithmException.java | 1 - .../client/AbstractAuthenticationHandler.java | 1 - .../http/impl/client/AbstractHttpClient.java | 2 - .../http/impl/client/BasicCookieStore.java | 8 - .../impl/client/BasicCredentialsProvider.java | 8 - .../impl/client/BasicResponseHandler.java | 1 - .../http/impl/client/ClientParamsStack.java | 1 - .../DefaultConnectionKeepAliveStrategy.java | 1 - .../http/impl/client/DefaultHttpClient.java | 2 - .../DefaultHttpRequestRetryHandler.java | 2 - .../DefaultProxyAuthenticationHandler.java | 1 - .../impl/client/DefaultRedirectHandler.java | 1 - .../impl/client/DefaultRequestDirector.java | 2 - .../DefaultTargetAuthenticationHandler.java | 1 - .../client/EntityEnclosingRequestWrapper.java | 1 - .../http/impl/client/RequestWrapper.java | 1 - .../http/impl/client/RoutedRequest.java | 1 - .../impl/conn/AbstractClientConnAdapter.java | 1 - .../http/impl/conn/AbstractPoolEntry.java | 2 - .../impl/conn/AbstractPooledConnAdapter.java | 1 - .../impl/conn/DefaultClientConnection.java | 1 - .../conn/DefaultClientConnectionOperator.java | 1 - .../impl/conn/LoggingSessionInputBuffer.java | 3 - .../impl/conn/LoggingSessionOutputBuffer.java | 1 - .../impl/conn/SingleClientConnManager.java | 2 - .../java/org/apache/http/impl/conn/Wire.java | 1 - .../http/impl/conn/tsccm/ConnPoolByRoute.java | 3 - .../tsccm/ThreadSafeClientConnManager.java | 2 - .../http/impl/conn/tsccm/WaitingThread.java | 1 - .../http/impl/cookie/AbstractCookieSpec.java | 1 - .../http/impl/cookie/BasicClientCookie.java | 10 - .../http/impl/cookie/BasicClientCookie2.java | 1 - .../http/impl/cookie/BestMatchSpec.java | 1 - .../impl/cookie/BestMatchSpecFactory.java | 1 - .../http/impl/cookie/BrowserCompatSpec.java | 1 - .../impl/cookie/BrowserCompatSpecFactory.java | 1 - .../http/impl/cookie/CookieSpecBase.java | 1 - .../http/impl/cookie/DateParseException.java | 1 - .../apache/http/impl/cookie/DateUtils.java | 3 - .../http/impl/cookie/NetscapeDraftSpec.java | 10 - .../impl/cookie/NetscapeDraftSpecFactory.java | 1 - .../http/impl/cookie/PublicSuffixFilter.java | 242 +++++++++--------- .../impl/cookie/PublicSuffixListParser.java | 216 ++++++++-------- .../apache/http/impl/cookie/RFC2109Spec.java | 10 - .../http/impl/cookie/RFC2109SpecFactory.java | 1 - .../cookie/RFC2965DomainAttributeHandler.java | 1 - .../apache/http/impl/cookie/RFC2965Spec.java | 2 - .../http/impl/cookie/RFC2965SpecFactory.java | 1 - .../http/client/utils/TestRfc3492Idn.java | 190 +++++++------- .../java/org/apache/http/conn/TestScheme.java | 2 - .../http/conn/ssl/CertificatesToPlayWith.java | 1 - .../http/conn/ssl/TestHostnameVerifier.java | 1 - .../http/conn/ssl/TestSSLSocketFactory.java | 1 - .../http/impl/auth/TestDigestScheme.java | 3 - .../client/TestBasicCredentialsProvider.java | 4 - .../apache/http/impl/conn/ExecReqThread.java | 2 - .../impl/conn/tsccm/TestSpuriousWakeup.java | 1 - .../impl/cookie/TestBrowserCompatSpec.java | 6 - .../impl/cookie/TestCookieBestMatchSpec.java | 1 - .../impl/cookie/TestCookieNetscapeDraft.java | 1 - .../impl/cookie/TestCookieRFC2109Spec.java | 1 - .../impl/cookie/TestCookieRFC2965Spec.java | 1 - .../http/impl/cookie/TestDateUtils.java | 1 - .../cookie/TestNetscapeDraftHeaderParser.java | 1 - .../cookie/TestPublicSuffixListParser.java | 230 ++++++++--------- .../apache/http/localserver/EchoHandler.java | 2 - .../http/localserver/LocalTestServer.java | 2 - .../http/localserver/RandomHandler.java | 2 - .../http/mockup/HttpConnectionMockup.java | 1 - .../apache/http/entity/mime/FormBodyPart.java | 1 - .../http/entity/mime/HttpMultipart.java | 1 - .../http/entity/mime/MultipartEntity.java | 1 - src/site/resources/images/browser.png | Bin src/site/resources/images/httpclient.png | Bin 177 files changed, 728 insertions(+), 1007 deletions(-) mode change 100755 => 100644 src/site/resources/images/browser.png mode change 100755 => 100644 src/site/resources/images/httpclient.png diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java index 6fe6656b1..bfe96f0b8 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteDirect.java @@ -57,7 +57,6 @@ import org.apache.http.util.EntityUtils; /** * How to send a request directly using {@link HttpClient HttpClient}. * - * @author Roland Weber * * * diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java index 07d04c772..683d10618 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientExecuteProxy.java @@ -59,7 +59,6 @@ import org.apache.http.util.EntityUtils; /** * How to send a request via proxy using {@link HttpClient HttpClient}. * - * @author Roland Weber * * * diff --git a/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java b/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java index 516f09385..101e2bb7c 100644 --- a/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java +++ b/module-client/src/examples/org/apache/http/examples/client/ClientMultiThreadedExecution.java @@ -53,7 +53,6 @@ import org.apache.http.util.EntityUtils; /** * An example that performs GETs from multiple threads. * - * @author Michael Becke */ public class ClientMultiThreadedExecution { diff --git a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java index 3564083fa..e2cf5c64b 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java +++ b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectDirect.java @@ -62,7 +62,6 @@ import org.apache.http.protocol.BasicHttpContext; * The subsequent message exchange in this example should not * be used as a template. * - * @author Roland Weber * * * diff --git a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java index e87c38071..d4229590d 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java +++ b/module-client/src/examples/org/apache/http/examples/conn/ManagerConnectProxy.java @@ -63,7 +63,6 @@ import org.apache.http.protocol.BasicHttpContext; * The message exchange, both subsequently and for tunnelling, * should not be used as a template. * - * @author Roland Weber * * * diff --git a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java index e378671d1..d4107c110 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java +++ b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectDirect.java @@ -60,7 +60,6 @@ import org.apache.http.protocol.BasicHttpContext; * The subsequent message exchange in this example should not * be used as a template. * - * @author Roland Weber * * * diff --git a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java index 2d34917a5..4434eff67 100644 --- a/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java +++ b/module-client/src/examples/org/apache/http/examples/conn/OperatorConnectProxy.java @@ -61,7 +61,6 @@ import org.apache.http.protocol.BasicHttpContext; * The message exchange, both subsequently and for tunnelling, * should not be used as a template. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/auth/AUTH.java b/module-client/src/main/java/org/apache/http/auth/AUTH.java index 2f5d66a5a..0c68cffa3 100644 --- a/module-client/src/main/java/org/apache/http/auth/AUTH.java +++ b/module-client/src/main/java/org/apache/http/auth/AUTH.java @@ -34,7 +34,6 @@ package org.apache.http.auth; /** * Constants and static helpers related to the HTTP authentication. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/AuthScheme.java b/module-client/src/main/java/org/apache/http/auth/AuthScheme.java index 24d7c272a..81f1cbfb5 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthScheme.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthScheme.java @@ -62,8 +62,6 @@ import org.apache.http.HttpRequest; * challenge-response exchanges *

* - * @author Oleg Kalnichevski - * @author Adrian Sutton * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/AuthSchemeFactory.java b/module-client/src/main/java/org/apache/http/auth/AuthSchemeFactory.java index c58d831e1..59e59f6b4 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthSchemeFactory.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthSchemeFactory.java @@ -35,7 +35,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java b/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java index 59ff7ae21..12ce45621 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthSchemeRegistry.java @@ -42,7 +42,6 @@ import org.apache.http.params.HttpParams; * Authentication scheme registry that can be used to obtain the corresponding * authentication scheme implementation for a given type of authorization challenge. * - * @author Oleg Kalnichevski * * * @version $Revision$ diff --git a/module-client/src/main/java/org/apache/http/auth/AuthScope.java b/module-client/src/main/java/org/apache/http/auth/AuthScope.java index 344d6ff1c..5eb6a4de8 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthScope.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthScope.java @@ -39,8 +39,6 @@ import org.apache.http.util.LangUtils; * a port number, a realm name and an authentication scheme name which * {@link Credentials Credentials} apply to. * - * @author Oleg Kalnichevski - * @author Adrian Sutton * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/AuthState.java b/module-client/src/main/java/org/apache/http/auth/AuthState.java index b18e2feb6..5a848a6a0 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthState.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthState.java @@ -35,7 +35,6 @@ package org.apache.http.auth; * This class provides detailed information about the state of the * authentication process. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/AuthenticationException.java b/module-client/src/main/java/org/apache/http/auth/AuthenticationException.java index 6a332b3e4..0c437176b 100644 --- a/module-client/src/main/java/org/apache/http/auth/AuthenticationException.java +++ b/module-client/src/main/java/org/apache/http/auth/AuthenticationException.java @@ -35,7 +35,6 @@ import org.apache.http.ProtocolException; /** * Signals a failure in authentication process * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/BasicUserPrincipal.java b/module-client/src/main/java/org/apache/http/auth/BasicUserPrincipal.java index b579ce989..92c49aaea 100644 --- a/module-client/src/main/java/org/apache/http/auth/BasicUserPrincipal.java +++ b/module-client/src/main/java/org/apache/http/auth/BasicUserPrincipal.java @@ -37,7 +37,6 @@ import org.apache.http.util.LangUtils; /** * Basic user principal used for HTTP authentication * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/Credentials.java b/module-client/src/main/java/org/apache/http/auth/Credentials.java index ae09f19ce..c599e76f7 100644 --- a/module-client/src/main/java/org/apache/http/auth/Credentials.java +++ b/module-client/src/main/java/org/apache/http/auth/Credentials.java @@ -35,8 +35,6 @@ import java.security.Principal; /** * User name and password based authentication credentials. * - * @author Unascribed - * @author Mike Bowler * * @version $Revision$ $Date$ */ diff --git a/module-client/src/main/java/org/apache/http/auth/InvalidCredentialsException.java b/module-client/src/main/java/org/apache/http/auth/InvalidCredentialsException.java index 6bf54c1fd..cb10b3b77 100644 --- a/module-client/src/main/java/org/apache/http/auth/InvalidCredentialsException.java +++ b/module-client/src/main/java/org/apache/http/auth/InvalidCredentialsException.java @@ -34,7 +34,6 @@ package org.apache.http.auth; * Authentication credentials required to respond to a authentication * challenge are invalid * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/MalformedChallengeException.java b/module-client/src/main/java/org/apache/http/auth/MalformedChallengeException.java index a49470f51..48bb2a5f4 100644 --- a/module-client/src/main/java/org/apache/http/auth/MalformedChallengeException.java +++ b/module-client/src/main/java/org/apache/http/auth/MalformedChallengeException.java @@ -36,7 +36,6 @@ import org.apache.http.ProtocolException; * Signals that authentication challenge is in some way invalid or * illegal in the given context * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/NTCredentials.java b/module-client/src/main/java/org/apache/http/auth/NTCredentials.java index 4ecac298c..9bd19a39b 100644 --- a/module-client/src/main/java/org/apache/http/auth/NTCredentials.java +++ b/module-client/src/main/java/org/apache/http/auth/NTCredentials.java @@ -37,9 +37,6 @@ import org.apache.http.util.LangUtils; /** {@link Credentials} specific to the Windows platform. * - * @author Adrian Sutton - * @author Mike Bowler - * @author Oleg Kalnichevski * * @since 2.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/NTUserPrincipal.java b/module-client/src/main/java/org/apache/http/auth/NTUserPrincipal.java index 96ea78c45..512c6c76a 100644 --- a/module-client/src/main/java/org/apache/http/auth/NTUserPrincipal.java +++ b/module-client/src/main/java/org/apache/http/auth/NTUserPrincipal.java @@ -37,7 +37,6 @@ import org.apache.http.util.LangUtils; /** NT (MS Windows specific) user principal used for HTTP authentication * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java b/module-client/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java index 341b60d6a..dd6cefc86 100644 --- a/module-client/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java +++ b/module-client/src/main/java/org/apache/http/auth/UsernamePasswordCredentials.java @@ -37,10 +37,6 @@ import org.apache.http.util.LangUtils; /** * Username and password {@link Credentials} * - * @author Remy Maucherat - * @author Sean C. Sullivan - * @author Mike Bowler - * @author Oleg Kalnichevski * * @version $Revision$ $Date$ * diff --git a/module-client/src/main/java/org/apache/http/auth/params/AuthParams.java b/module-client/src/main/java/org/apache/http/auth/params/AuthParams.java index 7c458c3d4..1668a4062 100644 --- a/module-client/src/main/java/org/apache/http/auth/params/AuthParams.java +++ b/module-client/src/main/java/org/apache/http/auth/params/AuthParams.java @@ -38,7 +38,6 @@ import org.apache.http.protocol.HTTP; * This class implements an adaptor around the {@link HttpParams} interface * to simplify manipulation of the HTTP authentication specific parameters. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/AuthenticationHandler.java b/module-client/src/main/java/org/apache/http/client/AuthenticationHandler.java index 49529c189..49d17f97f 100644 --- a/module-client/src/main/java/org/apache/http/client/AuthenticationHandler.java +++ b/module-client/src/main/java/org/apache/http/client/AuthenticationHandler.java @@ -41,7 +41,6 @@ import org.apache.http.auth.MalformedChallengeException; import org.apache.http.protocol.HttpContext; /** - * @author Oleg Kalnichevski */ public interface AuthenticationHandler { diff --git a/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java b/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java index 37faa2110..e2b0517ee 100644 --- a/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java +++ b/module-client/src/main/java/org/apache/http/client/CircularRedirectException.java @@ -33,7 +33,6 @@ package org.apache.http.client; /** * Signals a circular redirect * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/client/CookieStore.java b/module-client/src/main/java/org/apache/http/client/CookieStore.java index 6d682d8f4..ca7ad41fd 100644 --- a/module-client/src/main/java/org/apache/http/client/CookieStore.java +++ b/module-client/src/main/java/org/apache/http/client/CookieStore.java @@ -38,7 +38,6 @@ import org.apache.http.cookie.Cookie; /** * Abstract cookie store. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/client/CredentialsProvider.java b/module-client/src/main/java/org/apache/http/client/CredentialsProvider.java index db72e1e29..8288ca0e4 100644 --- a/module-client/src/main/java/org/apache/http/client/CredentialsProvider.java +++ b/module-client/src/main/java/org/apache/http/client/CredentialsProvider.java @@ -36,7 +36,6 @@ import org.apache.http.auth.Credentials; /** * Abstract credentials provider. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/client/HttpClient.java b/module-client/src/main/java/org/apache/http/client/HttpClient.java index c5abba9d1..e00c16f3d 100644 --- a/module-client/src/main/java/org/apache/http/client/HttpClient.java +++ b/module-client/src/main/java/org/apache/http/client/HttpClient.java @@ -100,7 +100,6 @@ import org.apache.http.protocol.HttpContext; * } * * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java b/module-client/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java index 61dc2cfdb..effbecf94 100644 --- a/module-client/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java +++ b/module-client/src/main/java/org/apache/http/client/HttpRequestRetryHandler.java @@ -44,8 +44,6 @@ import org.apache.http.protocol.HttpContext; * data as methods of this interfrace may be executed from multiple threads *

* - * @author Michael Becke - * @author Oleg Kalnichevski */ public interface HttpRequestRetryHandler { diff --git a/module-client/src/main/java/org/apache/http/client/NonRepeatableRequestException.java b/module-client/src/main/java/org/apache/http/client/NonRepeatableRequestException.java index f99b9c077..c3685bded 100644 --- a/module-client/src/main/java/org/apache/http/client/NonRepeatableRequestException.java +++ b/module-client/src/main/java/org/apache/http/client/NonRepeatableRequestException.java @@ -36,7 +36,6 @@ import org.apache.http.ProtocolException; * Signals failure to retry the request due to non-repeatable request * entity. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/client/RedirectException.java b/module-client/src/main/java/org/apache/http/client/RedirectException.java index 7771b226d..8720b115d 100644 --- a/module-client/src/main/java/org/apache/http/client/RedirectException.java +++ b/module-client/src/main/java/org/apache/http/client/RedirectException.java @@ -35,7 +35,6 @@ import org.apache.http.ProtocolException; /** * Signals violation of HTTP specification caused by an invalid redirect * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/client/RedirectHandler.java b/module-client/src/main/java/org/apache/http/client/RedirectHandler.java index 31b1fa66e..d85d57ad0 100644 --- a/module-client/src/main/java/org/apache/http/client/RedirectHandler.java +++ b/module-client/src/main/java/org/apache/http/client/RedirectHandler.java @@ -47,7 +47,6 @@ import org.apache.http.protocol.HttpContext; * data as methods of this interfrace may be executed from multiple threads *

* - * @author Oleg Kalnichevski */ public interface RedirectHandler { diff --git a/module-client/src/main/java/org/apache/http/client/RequestDirector.java b/module-client/src/main/java/org/apache/http/client/RequestDirector.java index b885fa7e3..5b32ec571 100644 --- a/module-client/src/main/java/org/apache/http/client/RequestDirector.java +++ b/module-client/src/main/java/org/apache/http/client/RequestDirector.java @@ -52,7 +52,6 @@ import org.apache.http.protocol.HttpContext; * connections for reading the response entity. Such connections * MUST be released, but that is out of the scope of a request director. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/client/ResponseHandler.java b/module-client/src/main/java/org/apache/http/client/ResponseHandler.java index fe8f7be47..d573e28d0 100644 --- a/module-client/src/main/java/org/apache/http/client/ResponseHandler.java +++ b/module-client/src/main/java/org/apache/http/client/ResponseHandler.java @@ -38,7 +38,6 @@ import org.apache.http.HttpResponse; * Handler that encapsulates the process of generating a response object * from a {@link HttpResponse}. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/client/UserTokenHandler.java b/module-client/src/main/java/org/apache/http/client/UserTokenHandler.java index 2117bb5dd..c1a09a74b 100644 --- a/module-client/src/main/java/org/apache/http/client/UserTokenHandler.java +++ b/module-client/src/main/java/org/apache/http/client/UserTokenHandler.java @@ -1,7 +1,7 @@ /* - * $HeadURL:$ - * $Revision:$ - * $Date:$ + * $HeadURL$ + * $Revision$ + * $Date$ * * ==================================================================== * Licensed to the Apache Software Foundation (ASF) under one @@ -43,7 +43,6 @@ import org.apache.http.protocol.HttpContext; * The user token will be used to ensure that user specific resouces will not * shared with or reused by other users. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java b/module-client/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java index bb3188cf0..4d4d88197 100644 --- a/module-client/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java +++ b/module-client/src/main/java/org/apache/http/client/methods/AbortableHttpRequest.java @@ -44,7 +44,6 @@ import org.apache.http.impl.conn.tsccm.ThreadSafeClientConnManager; * Interface representing an HTTP request that can be aborted by shutting * down the underlying HTTP connection. * - * @author Oleg Kalnichevski * * * @version $Revision$ diff --git a/module-client/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java b/module-client/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java index d9df5345e..46826ebc9 100644 --- a/module-client/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java +++ b/module-client/src/main/java/org/apache/http/client/methods/HttpEntityEnclosingRequestBase.java @@ -40,7 +40,6 @@ import org.apache.http.protocol.HTTP; /** * Basic implementation of an HTTP request that can be modified. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java b/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java index f00a21756..8af42c860 100644 --- a/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java +++ b/module-client/src/main/java/org/apache/http/client/methods/HttpRequestBase.java @@ -50,7 +50,6 @@ import org.apache.http.params.HttpProtocolParams; /** * Basic implementation of an HTTP request that can be modified. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java b/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java index c18159e5a..628f856c5 100644 --- a/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java +++ b/module-client/src/main/java/org/apache/http/client/methods/HttpUriRequest.java @@ -40,7 +40,6 @@ import org.apache.http.HttpRequest; * convenience methods to access request properties such as request URI * and method type. * - * @author Oleg Kalnichevski * * * @version $Revision$ diff --git a/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java b/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java index e454702ef..4f7182801 100644 --- a/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java +++ b/module-client/src/main/java/org/apache/http/client/params/HttpClientParams.java @@ -35,7 +35,6 @@ import org.apache.http.params.HttpParams; /** * An adaptor for accessing HTTP client parameters in {@link HttpParams}. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java b/module-client/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java index b0def4180..ea3096c3a 100644 --- a/module-client/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java +++ b/module-client/src/main/java/org/apache/http/client/protocol/RequestAddCookies.java @@ -62,7 +62,6 @@ import org.apache.http.protocol.ExecutionContext; * {@link CookieStore} to the request being executed and generates * corresponding cookierequest headers. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java b/module-client/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java index ef880c0fb..b7792679f 100644 --- a/module-client/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java +++ b/module-client/src/main/java/org/apache/http/client/protocol/RequestDefaultHeaders.java @@ -44,7 +44,6 @@ import org.apache.http.protocol.HttpContext; /** * Request interceptor that adds default request headers. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java b/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java index e9f9dd5f1..d87d90e0a 100644 --- a/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java +++ b/module-client/src/main/java/org/apache/http/client/protocol/RequestProxyAuthentication.java @@ -46,7 +46,6 @@ import org.apache.http.auth.Credentials; import org.apache.http.protocol.HttpContext; /** - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java b/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java index 03acb1a34..860f32a8a 100644 --- a/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java +++ b/module-client/src/main/java/org/apache/http/client/protocol/RequestTargetAuthentication.java @@ -46,7 +46,6 @@ import org.apache.http.auth.Credentials; import org.apache.http.protocol.HttpContext; /** - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java b/module-client/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java index 037d5e141..2dec5117b 100644 --- a/module-client/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java +++ b/module-client/src/main/java/org/apache/http/client/protocol/ResponseProcessCookies.java @@ -53,7 +53,6 @@ import org.apache.http.protocol.HttpContext; * Response interceptor that populates the current {@link CookieStore} with data * contained in response cookies received in the given the HTTP response. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/client/utils/Idn.java b/module-client/src/main/java/org/apache/http/client/utils/Idn.java index fa59b5f27..56566832b 100644 --- a/module-client/src/main/java/org/apache/http/client/utils/Idn.java +++ b/module-client/src/main/java/org/apache/http/client/utils/Idn.java @@ -1,44 +1,44 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.client.utils; - -/** - * Abstraction of international domain name (IDN) conversion. - */ -public interface Idn { - /** - * Converts a name from its punycode representation to Unicode. - * The name may be a single hostname or a dot-separated qualified domain name. - * @param punycode the Punycode representation - * @return the Unicode domain name - */ - String toUnicode(String punycode); +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.client.utils; + +/** + * Abstraction of international domain name (IDN) conversion. + */ +public interface Idn { + /** + * Converts a name from its punycode representation to Unicode. + * The name may be a single hostname or a dot-separated qualified domain name. + * @param punycode the Punycode representation + * @return the Unicode domain name + */ + String toUnicode(String punycode); } \ No newline at end of file diff --git a/module-client/src/main/java/org/apache/http/client/utils/JdkIdn.java b/module-client/src/main/java/org/apache/http/client/utils/JdkIdn.java index 7535d02d9..3ddd7fe9d 100644 --- a/module-client/src/main/java/org/apache/http/client/utils/JdkIdn.java +++ b/module-client/src/main/java/org/apache/http/client/utils/JdkIdn.java @@ -1,70 +1,70 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.client.utils; - -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; - -/** - * Uses the java.net.IDN class through reflection. - */ -public class JdkIdn implements Idn { - private Method toUnicode; - - /** - * - * @throws ClassNotFoundException if java.net.IDN is not available - */ - public JdkIdn() throws ClassNotFoundException { - Class clazz = Class.forName("java.net.IDN"); - try { - toUnicode = clazz.getMethod("toUnicode", String.class); - } catch (SecurityException e) { - // doesn't happen - throw new IllegalStateException(e.getMessage(), e); - } catch (NoSuchMethodException e) { - // doesn't happen - throw new IllegalStateException(e.getMessage(), e); - } - } - - public String toUnicode(String punycode) { - try { - return (String) toUnicode.invoke(null, punycode); - } catch (IllegalAccessException e) { - throw new IllegalStateException(e.getMessage(), e); - } catch (InvocationTargetException e) { - Throwable t = e.getCause(); - throw new RuntimeException(t.getMessage(), t); - } - } - +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.client.utils; + +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; + +/** + * Uses the java.net.IDN class through reflection. + */ +public class JdkIdn implements Idn { + private Method toUnicode; + + /** + * + * @throws ClassNotFoundException if java.net.IDN is not available + */ + public JdkIdn() throws ClassNotFoundException { + Class clazz = Class.forName("java.net.IDN"); + try { + toUnicode = clazz.getMethod("toUnicode", String.class); + } catch (SecurityException e) { + // doesn't happen + throw new IllegalStateException(e.getMessage(), e); + } catch (NoSuchMethodException e) { + // doesn't happen + throw new IllegalStateException(e.getMessage(), e); + } + } + + public String toUnicode(String punycode) { + try { + return (String) toUnicode.invoke(null, punycode); + } catch (IllegalAccessException e) { + throw new IllegalStateException(e.getMessage(), e); + } catch (InvocationTargetException e) { + Throwable t = e.getCause(); + throw new RuntimeException(t.getMessage(), t); + } + } + } \ No newline at end of file diff --git a/module-client/src/main/java/org/apache/http/client/utils/Punycode.java b/module-client/src/main/java/org/apache/http/client/utils/Punycode.java index 1150d04c4..41bd3280f 100644 --- a/module-client/src/main/java/org/apache/http/client/utils/Punycode.java +++ b/module-client/src/main/java/org/apache/http/client/utils/Punycode.java @@ -1,54 +1,54 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.client.utils; - -/** - * Facade that provides conversion between Unicode and Punycode domain names. - * It will use an appropriate implementation. - */ -public class Punycode { - private static Idn impl; - static { - init(); - } - - public static String toUnicode(String punycode) { - return impl.toUnicode(punycode); - } - - private static void init() { - try { - impl = new JdkIdn(); - } catch (Exception e) { - impl = new Rfc3492Idn(); - } - } -} +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.client.utils; + +/** + * Facade that provides conversion between Unicode and Punycode domain names. + * It will use an appropriate implementation. + */ +public class Punycode { + private static Idn impl; + static { + init(); + } + + public static String toUnicode(String punycode) { + return impl.toUnicode(punycode); + } + + private static void init() { + try { + impl = new JdkIdn(); + } catch (Exception e) { + impl = new Rfc3492Idn(); + } + } +} diff --git a/module-client/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java b/module-client/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java index 18461ab26..4d61fe3a5 100644 --- a/module-client/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java +++ b/module-client/src/main/java/org/apache/http/client/utils/Rfc3492Idn.java @@ -1,121 +1,121 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.client.utils; - -import java.util.StringTokenizer; - -/** - * Implementation from pseudo code in RFC 3492. - */ -public class Rfc3492Idn implements Idn { - private static final int base = 36; - private static final int tmin = 1; - private static final int tmax = 26; - private static final int skew = 38; - private static final int damp = 700; - private static final int initial_bias = 72; - private static final int initial_n = 128; - private static final char delimiter = '-'; - private static final String ACE_PREFIX = "xn--"; - - private int adapt(int delta, int numpoints, boolean firsttime) { - if (firsttime) delta = delta / damp; - else delta = delta / 2; - delta = delta + (delta / numpoints); - int k = 0; - while (delta > ((base - tmin) * tmax) / 2) { - delta = delta / (base - tmin); - k = k + base; - } - return k + (((base - tmin + 1) * delta) / (delta + skew)); - } - - private int digit(char c) { - if ((c >= 'A') && (c <= 'Z')) return (c - 'A'); - if ((c >= 'a') && (c <= 'z')) return (c - 'a'); - if ((c >= '0') && (c <= '9')) return (c - '0') + 26; - throw new IllegalArgumentException("illegal digit: "+ c); - } - - public String toUnicode(String punycode) { - StringBuffer unicode = new StringBuffer(punycode.length()); - StringTokenizer tok = new StringTokenizer(punycode, "."); - while (tok.hasMoreTokens()) { - String t = tok.nextToken(); - if (unicode.length() > 0) unicode.append('.'); - if (t.startsWith(ACE_PREFIX)) t = decode(t.substring(4)); - unicode.append(t); - } - return unicode.toString(); - } - - protected String decode(String input) { - int n = initial_n; - int i = 0; - int bias = initial_bias; - StringBuffer output = new StringBuffer(input.length()); - int lastdelim = input.lastIndexOf(delimiter); - if (lastdelim != -1) { - output.append(input.subSequence(0, lastdelim)); - input = input.substring(lastdelim + 1); - } - - while (input.length() > 0) { - int oldi = i; - int w = 1; - for (int k = base;; k += base) { - if (input.length() == 0) break; - char c = input.charAt(0); - input = input.substring(1); - int digit = digit(c); - i = i + digit * w; // FIXME fail on overflow - int t; - if (k <= bias + tmin) { - t = tmin; - } else if (k >= bias + tmax) { - t = tmax; - } else { - t = k - bias; - } - if (digit < t) break; - w = w * (base - t); // FIXME fail on overflow - } - bias = adapt(i - oldi, output.length() + 1, (oldi == 0)); - n = n + i / (output.length() + 1); // FIXME fail on overflow - i = i % (output.length() + 1); - // {if n is a basic code point then fail} - output.insert(i, (char) n); - i++; - } - return output.toString(); - } - +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.client.utils; + +import java.util.StringTokenizer; + +/** + * Implementation from pseudo code in RFC 3492. + */ +public class Rfc3492Idn implements Idn { + private static final int base = 36; + private static final int tmin = 1; + private static final int tmax = 26; + private static final int skew = 38; + private static final int damp = 700; + private static final int initial_bias = 72; + private static final int initial_n = 128; + private static final char delimiter = '-'; + private static final String ACE_PREFIX = "xn--"; + + private int adapt(int delta, int numpoints, boolean firsttime) { + if (firsttime) delta = delta / damp; + else delta = delta / 2; + delta = delta + (delta / numpoints); + int k = 0; + while (delta > ((base - tmin) * tmax) / 2) { + delta = delta / (base - tmin); + k = k + base; + } + return k + (((base - tmin + 1) * delta) / (delta + skew)); + } + + private int digit(char c) { + if ((c >= 'A') && (c <= 'Z')) return (c - 'A'); + if ((c >= 'a') && (c <= 'z')) return (c - 'a'); + if ((c >= '0') && (c <= '9')) return (c - '0') + 26; + throw new IllegalArgumentException("illegal digit: "+ c); + } + + public String toUnicode(String punycode) { + StringBuffer unicode = new StringBuffer(punycode.length()); + StringTokenizer tok = new StringTokenizer(punycode, "."); + while (tok.hasMoreTokens()) { + String t = tok.nextToken(); + if (unicode.length() > 0) unicode.append('.'); + if (t.startsWith(ACE_PREFIX)) t = decode(t.substring(4)); + unicode.append(t); + } + return unicode.toString(); + } + + protected String decode(String input) { + int n = initial_n; + int i = 0; + int bias = initial_bias; + StringBuffer output = new StringBuffer(input.length()); + int lastdelim = input.lastIndexOf(delimiter); + if (lastdelim != -1) { + output.append(input.subSequence(0, lastdelim)); + input = input.substring(lastdelim + 1); + } + + while (input.length() > 0) { + int oldi = i; + int w = 1; + for (int k = base;; k += base) { + if (input.length() == 0) break; + char c = input.charAt(0); + input = input.substring(1); + int digit = digit(c); + i = i + digit * w; // FIXME fail on overflow + int t; + if (k <= bias + tmin) { + t = tmin; + } else if (k >= bias + tmax) { + t = tmax; + } else { + t = k - bias; + } + if (digit < t) break; + w = w * (base - t); // FIXME fail on overflow + } + bias = adapt(i - oldi, output.length() + 1, (oldi == 0)); + n = n + i / (output.length() + 1); // FIXME fail on overflow + i = i % (output.length() + 1); + // {if n is a basic code point then fail} + output.insert(i, (char) n); + i++; + } + return output.toString(); + } + } \ No newline at end of file diff --git a/module-client/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java b/module-client/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java index b2e676c1c..5d57002d5 100644 --- a/module-client/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java +++ b/module-client/src/main/java/org/apache/http/conn/BasicEofSensorWatcher.java @@ -38,7 +38,6 @@ import java.io.IOException; * Basic implementation of {@link EofSensorWatcher EofSensorWatcher}. * The underlying connection is released on close or EOF. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/BasicManagedEntity.java b/module-client/src/main/java/org/apache/http/conn/BasicManagedEntity.java index 232272f27..b348d0806 100644 --- a/module-client/src/main/java/org/apache/http/conn/BasicManagedEntity.java +++ b/module-client/src/main/java/org/apache/http/conn/BasicManagedEntity.java @@ -44,7 +44,6 @@ import org.apache.http.entity.HttpEntityWrapper; * typically not return a managed entity, but you can replace * the unmanaged entity in the response with a managed one. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java index f71de5436..1517af62a 100644 --- a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java +++ b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManager.java @@ -40,10 +40,6 @@ import org.apache.http.conn.scheme.SchemeRegistry; /** * Management interface for {@link ManagedClientConnection client connections}. * - * @author Michael Becke - * @author Mike Bowler - * @author Oleg Kalnichevski - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java index 7ba6a9ce0..ef34d684b 100644 --- a/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/ClientConnectionManagerFactory.java @@ -37,7 +37,6 @@ import org.apache.http.params.HttpParams; /** * A factory for creating new {@link ClientConnectionManager} instances. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java b/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java index c119333fd..75fcc729c 100644 --- a/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java +++ b/module-client/src/main/java/org/apache/http/conn/ClientConnectionOperator.java @@ -52,7 +52,6 @@ import org.apache.http.protocol.HttpContext; * sockets. Creating a tunnelled connection through a proxy, however, * is not within the scope of the operator. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/ConnectTimeoutException.java b/module-client/src/main/java/org/apache/http/conn/ConnectTimeoutException.java index bca999937..d751a679b 100644 --- a/module-client/src/main/java/org/apache/http/conn/ConnectTimeoutException.java +++ b/module-client/src/main/java/org/apache/http/conn/ConnectTimeoutException.java @@ -37,7 +37,6 @@ import java.io.InterruptedIOException; * A timeout while connecting to an HTTP server or waiting for an * available connection from an HttpConnectionManager. * - * @author Laura Werner * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java b/module-client/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java index e743b56c2..59d95d878 100644 --- a/module-client/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java +++ b/module-client/src/main/java/org/apache/http/conn/ConnectionKeepAliveStrategy.java @@ -38,7 +38,6 @@ import org.apache.http.protocol.HttpContext; * Interface for deciding how long a connection can remain * idle before being reused. * - * @author Sam Berlin * * * @version $Revision: $ diff --git a/module-client/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java b/module-client/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java index 5e83f0d96..b8148b8b0 100644 --- a/module-client/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java +++ b/module-client/src/main/java/org/apache/http/conn/ConnectionPoolTimeoutException.java @@ -35,7 +35,6 @@ package org.apache.http.conn; * A timeout while waiting for an available connection * from a connection manager. * - * @author Laura Werner * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java b/module-client/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java index 07dd14eea..18253645e 100644 --- a/module-client/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java +++ b/module-client/src/main/java/org/apache/http/conn/ConnectionReleaseTrigger.java @@ -45,7 +45,6 @@ import java.io.IOException; * The first invocation releases the connection, subsequent calls * are ignored. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/EofSensorInputStream.java b/module-client/src/main/java/org/apache/http/conn/EofSensorInputStream.java index bb37510b9..139d5a277 100644 --- a/module-client/src/main/java/org/apache/http/conn/EofSensorInputStream.java +++ b/module-client/src/main/java/org/apache/http/conn/EofSensorInputStream.java @@ -49,10 +49,6 @@ import java.io.IOException; * * @see EofSensorWatcher EofSensorWatcher * - * @author Roland Weber - * @author Ortwin Glueck - * @author Eric Johnson - * @author Mike Bowler * * * diff --git a/module-client/src/main/java/org/apache/http/conn/EofSensorWatcher.java b/module-client/src/main/java/org/apache/http/conn/EofSensorWatcher.java index f2fa4f48b..d6e0025a3 100644 --- a/module-client/src/main/java/org/apache/http/conn/EofSensorWatcher.java +++ b/module-client/src/main/java/org/apache/http/conn/EofSensorWatcher.java @@ -38,7 +38,6 @@ import java.io.IOException; * A watcher for {@link EofSensorInputStream EofSensorInputStream}. * Each stream will notify it's watcher at most once. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/ManagedClientConnection.java b/module-client/src/main/java/org/apache/http/conn/ManagedClientConnection.java index 1835e4bdc..b024a617d 100644 --- a/module-client/src/main/java/org/apache/http/conn/ManagedClientConnection.java +++ b/module-client/src/main/java/org/apache/http/conn/ManagedClientConnection.java @@ -50,7 +50,6 @@ import org.apache.http.conn.routing.HttpRoute; * A client-side connection with advanced connection logic. * Instances are typically obtained from a connection manager. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/OperatedClientConnection.java b/module-client/src/main/java/org/apache/http/conn/OperatedClientConnection.java index b3e838a51..d7d42ffd1 100644 --- a/module-client/src/main/java/org/apache/http/conn/OperatedClientConnection.java +++ b/module-client/src/main/java/org/apache/http/conn/OperatedClientConnection.java @@ -46,7 +46,6 @@ import org.apache.http.params.HttpParams; * {@link ClientConnectionOperator operator}. * * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java b/module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java index 7d09665d7..cb3804b7e 100644 --- a/module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java +++ b/module-client/src/main/java/org/apache/http/conn/params/ConnManagerParams.java @@ -38,8 +38,6 @@ import org.apache.http.params.HttpParams; * to client-side * {@link org.apache.http.conn.ClientConnectionManager connection managers}. * - * @author Oleg Kalnichevski - * @author Michael Becke * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/conn/params/ConnPerRoute.java b/module-client/src/main/java/org/apache/http/conn/params/ConnPerRoute.java index 0af70f46f..74acab731 100644 --- a/module-client/src/main/java/org/apache/http/conn/params/ConnPerRoute.java +++ b/module-client/src/main/java/org/apache/http/conn/params/ConnPerRoute.java @@ -38,7 +38,6 @@ import org.apache.http.conn.routing.HttpRoute; * {@link org.apache.http.conn.ClientConnectionManager connection managers} for * a fine-grained control of connections on a per route basis. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java b/module-client/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java index 3c2155c14..bb4fad3a6 100644 --- a/module-client/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java +++ b/module-client/src/main/java/org/apache/http/conn/params/ConnPerRouteBean.java @@ -41,7 +41,6 @@ import org.apache.http.conn.routing.HttpRoute; * {@link org.apache.http.conn.ClientConnectionManager connection managers} for * a fine-grained control of connections on a per route basis. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java b/module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java index 6b2f57625..ed40fab05 100644 --- a/module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java +++ b/module-client/src/main/java/org/apache/http/conn/params/ConnRouteParams.java @@ -43,8 +43,6 @@ import org.apache.http.conn.routing.HttpRoute; * An adaptor for accessing route related parameters in {@link HttpParams}. * See {@link ConnRoutePNames} for parameter name definitions. * - * @author Oleg Kalnichevski - * @author Roland Weber * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java b/module-client/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java index 24b4b42df..fc8c547a2 100644 --- a/module-client/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java +++ b/module-client/src/main/java/org/apache/http/conn/routing/BasicRouteDirector.java @@ -37,7 +37,6 @@ package org.apache.http.conn.routing; * Basic implementation of an {@link HttpRouteDirector HttpRouteDirector}. * This implementation is stateless and therefore thread-safe. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/routing/HttpRoute.java b/module-client/src/main/java/org/apache/http/conn/routing/HttpRoute.java index 55fc81896..c823924c8 100644 --- a/module-client/src/main/java/org/apache/http/conn/routing/HttpRoute.java +++ b/module-client/src/main/java/org/apache/http/conn/routing/HttpRoute.java @@ -40,7 +40,6 @@ import org.apache.http.HttpHost; * Instances of this class are unmodifiable and therefore suitable * for use as lookup keys. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/routing/HttpRouteDirector.java b/module-client/src/main/java/org/apache/http/conn/routing/HttpRouteDirector.java index 3d93b492c..bd6dc0b8b 100644 --- a/module-client/src/main/java/org/apache/http/conn/routing/HttpRouteDirector.java +++ b/module-client/src/main/java/org/apache/http/conn/routing/HttpRouteDirector.java @@ -38,7 +38,6 @@ package org.apache.http.conn.routing; * Implementations of this interface compare a planned route with * a tracked route and indicate the next step required. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/routing/RouteInfo.java b/module-client/src/main/java/org/apache/http/conn/routing/RouteInfo.java index fe648bf92..84a87650b 100644 --- a/module-client/src/main/java/org/apache/http/conn/routing/RouteInfo.java +++ b/module-client/src/main/java/org/apache/http/conn/routing/RouteInfo.java @@ -39,7 +39,6 @@ import org.apache.http.HttpHost; /** * Read-only interface for route information. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/routing/RouteTracker.java b/module-client/src/main/java/org/apache/http/conn/routing/RouteTracker.java index c389d9887..ae02fbfc8 100644 --- a/module-client/src/main/java/org/apache/http/conn/routing/RouteTracker.java +++ b/module-client/src/main/java/org/apache/http/conn/routing/RouteTracker.java @@ -39,7 +39,6 @@ import org.apache.http.HttpHost; /** * Helps tracking the steps in establishing a route. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java index 58a92a6a0..38e73ee5c 100644 --- a/module-client/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/LayeredSocketFactory.java @@ -39,8 +39,6 @@ import java.net.UnknownHostException; * A {@link SocketFactory SocketFactory} for layered sockets (SSL/TLS). * See there for things to consider when implementing a socket factory. * - * @author Michael Becke - * @author Mike Bowler * @since 4.0 */ public interface LayeredSocketFactory extends SocketFactory { diff --git a/module-client/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java index 5558cea75..c54625ba9 100644 --- a/module-client/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/PlainSocketFactory.java @@ -44,8 +44,6 @@ import org.apache.http.params.HttpParams; /** * The default class for creating sockets. * - * @author Roland Weber - * @author Michael Becke */ public final class PlainSocketFactory implements SocketFactory { diff --git a/module-client/src/main/java/org/apache/http/conn/scheme/Scheme.java b/module-client/src/main/java/org/apache/http/conn/scheme/Scheme.java index d48a95dde..3d5604261 100644 --- a/module-client/src/main/java/org/apache/http/conn/scheme/Scheme.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/Scheme.java @@ -49,10 +49,6 @@ import org.apache.http.util.LangUtils; * SchemeRegistry.DEFAULT.register(https); * * - * @author Roland Weber - * @author Michael Becke - * @author Jeff Dever - * @author Mike Bowler */ public final class Scheme { diff --git a/module-client/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java b/module-client/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java index 03c219f97..c0d45995e 100644 --- a/module-client/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/SchemeRegistry.java @@ -41,7 +41,6 @@ import org.apache.http.HttpHost; * A set of supported protocol {@link Scheme schemes}. * Schemes are identified by lowercase names. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/conn/scheme/SocketFactory.java b/module-client/src/main/java/org/apache/http/conn/scheme/SocketFactory.java index ed87dad9e..7e2e783a7 100644 --- a/module-client/src/main/java/org/apache/http/conn/scheme/SocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/scheme/SocketFactory.java @@ -47,9 +47,6 @@ import org.apache.http.params.HttpParams; * and {@link java.lang.Object#hashCode() Object.hashCode()} * must be overridden for the correct operation of some connection managers. * - * @author Roland Weber - * @author Michael Becke - * @author Mike Bowler */ public interface SocketFactory { diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java b/module-client/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java index 6efcde70f..d8d96333f 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/AbstractVerifier.java @@ -56,7 +56,6 @@ import javax.net.ssl.SSLSocket; * Abstract base class for all standard {@link X509HostnameVerifier} * implementations. * - * @author Julius Davies */ public abstract class AbstractVerifier implements X509HostnameVerifier { diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java b/module-client/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java index b84a5166f..520e50b4d 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/AllowAllHostnameVerifier.java @@ -35,7 +35,6 @@ package org.apache.http.conn.ssl; * The ALLOW_ALL HostnameVerifier essentially turns hostname verification * off. This implementation is a no-op, and never throws the SSLException. * - * @author Julius Davies */ public class AllowAllHostnameVerifier extends AbstractVerifier { diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java b/module-client/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java index 3d8408800..61f314f72 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/BrowserCompatHostnameVerifier.java @@ -43,7 +43,6 @@ import javax.net.ssl.SSLException; * (such as "*.foo.com") with BROWSER_COMPATIBLE matches all subdomains, * including "a.b.foo.com". * - * @author Julius Davies */ public class BrowserCompatHostnameVerifier extends AbstractVerifier { diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java b/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java index 04b3e42df..bb607b588 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/SSLSocketFactory.java @@ -134,8 +134,6 @@ import java.security.UnrecoverableKeyException; *

* * - * @author Oleg Kalnichevski - * @author Julius Davies */ public class SSLSocketFactory implements LayeredSocketFactory { diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java b/module-client/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java index 5a560ec51..3c59d37b9 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/StrictHostnameVerifier.java @@ -50,7 +50,6 @@ import javax.net.ssl.SSLException; * level, for example "a.foo.com". It does not match deeper subdomains * such as "a.b.foo.com". * - * @author Julius Davies */ public class StrictHostnameVerifier extends AbstractVerifier { diff --git a/module-client/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java b/module-client/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java index 07e064e8a..6b6e0f8f1 100644 --- a/module-client/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java +++ b/module-client/src/main/java/org/apache/http/conn/ssl/X509HostnameVerifier.java @@ -52,8 +52,6 @@ import java.security.cert.X509Certificate; * Inspired by Sebastian Hauer's original StrictSSLProtocolSocketFactory in the * HttpClient "contrib" repository. * - * @author Julius Davies - * @author Sebastian Hauer * * @since 4.0 (8-Dec-2006) */ diff --git a/module-client/src/main/java/org/apache/http/cookie/ClientCookie.java b/module-client/src/main/java/org/apache/http/cookie/ClientCookie.java index fe063879e..13af9c706 100644 --- a/module-client/src/main/java/org/apache/http/cookie/ClientCookie.java +++ b/module-client/src/main/java/org/apache/http/cookie/ClientCookie.java @@ -40,7 +40,6 @@ package org.apache.http.cookie; * Cookie header should include certain attributes only if * they were specified in the Set-Cookie header. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/Cookie.java b/module-client/src/main/java/org/apache/http/cookie/Cookie.java index c2ec7b2a2..497736c83 100644 --- a/module-client/src/main/java/org/apache/http/cookie/Cookie.java +++ b/module-client/src/main/java/org/apache/http/cookie/Cookie.java @@ -38,7 +38,6 @@ import java.util.Date; * that the HTTP agent and the target server can exchange to maintain * a session. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java b/module-client/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java index 0a40ad7f9..798626b94 100644 --- a/module-client/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java +++ b/module-client/src/main/java/org/apache/http/cookie/CookieAttributeHandler.java @@ -39,7 +39,6 @@ package org.apache.http.cookie; * implementation for this class based on their cookie handling * rules. * - * @author jain.samit@gmail.com (Samit Jain) * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java b/module-client/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java index 9baf65c37..d412fb82a 100644 --- a/module-client/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java +++ b/module-client/src/main/java/org/apache/http/cookie/CookieIdentityComparator.java @@ -42,7 +42,6 @@ import java.util.Comparator; * their domain attributes match ignoring case. *

* - * @author Oleg Kalnichevski */ public class CookieIdentityComparator implements Serializable, Comparator { diff --git a/module-client/src/main/java/org/apache/http/cookie/CookieOrigin.java b/module-client/src/main/java/org/apache/http/cookie/CookieOrigin.java index c985aee3b..9010d4ab5 100644 --- a/module-client/src/main/java/org/apache/http/cookie/CookieOrigin.java +++ b/module-client/src/main/java/org/apache/http/cookie/CookieOrigin.java @@ -36,7 +36,6 @@ import java.util.Locale; * CookieOrigin class incapsulates details of an origin server that * are relevant when parsing, validating or matching HTTP cookies. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/CookiePathComparator.java b/module-client/src/main/java/org/apache/http/cookie/CookiePathComparator.java index a6aa1865d..835feb9cb 100644 --- a/module-client/src/main/java/org/apache/http/cookie/CookiePathComparator.java +++ b/module-client/src/main/java/org/apache/http/cookie/CookiePathComparator.java @@ -46,7 +46,6 @@ import java.util.Comparator; * comparison is undefined. *

* - * @author Oleg Kalnichevski */ public class CookiePathComparator implements Serializable, Comparator { diff --git a/module-client/src/main/java/org/apache/http/cookie/CookieSpec.java b/module-client/src/main/java/org/apache/http/cookie/CookieSpec.java index 435fb8cfe..c2aa8d45f 100644 --- a/module-client/src/main/java/org/apache/http/cookie/CookieSpec.java +++ b/module-client/src/main/java/org/apache/http/cookie/CookieSpec.java @@ -45,8 +45,6 @@ import org.apache.http.Header; * * for a given host, port and path of origin * - * @author Oleg Kalnichevski - * @author Jeff Dever * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/CookieSpecFactory.java b/module-client/src/main/java/org/apache/http/cookie/CookieSpecFactory.java index b33dec32a..fa929dfee 100644 --- a/module-client/src/main/java/org/apache/http/cookie/CookieSpecFactory.java +++ b/module-client/src/main/java/org/apache/http/cookie/CookieSpecFactory.java @@ -35,7 +35,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java b/module-client/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java index 4cdafe7e5..463cc0a7d 100644 --- a/module-client/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java +++ b/module-client/src/main/java/org/apache/http/cookie/CookieSpecRegistry.java @@ -44,8 +44,6 @@ import org.apache.http.params.HttpParams; * cookie specification implementation for a given type of type or version of * cookie. * - * @author Oleg Kalnichevski - * @author Mike Bowler * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/MalformedCookieException.java b/module-client/src/main/java/org/apache/http/cookie/MalformedCookieException.java index 1fac0a23d..ee5bc5150 100644 --- a/module-client/src/main/java/org/apache/http/cookie/MalformedCookieException.java +++ b/module-client/src/main/java/org/apache/http/cookie/MalformedCookieException.java @@ -37,7 +37,6 @@ import org.apache.http.ProtocolException; * Signals that a cookie is in some way invalid or illegal in a given * context * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/SM.java b/module-client/src/main/java/org/apache/http/cookie/SM.java index adaeed5d3..49387e423 100644 --- a/module-client/src/main/java/org/apache/http/cookie/SM.java +++ b/module-client/src/main/java/org/apache/http/cookie/SM.java @@ -34,7 +34,6 @@ package org.apache.http.cookie; /** * Constants and static helpers related to the HTTP state management. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/SetCookie.java b/module-client/src/main/java/org/apache/http/cookie/SetCookie.java index fd18d57af..518d0b7e2 100644 --- a/module-client/src/main/java/org/apache/http/cookie/SetCookie.java +++ b/module-client/src/main/java/org/apache/http/cookie/SetCookie.java @@ -37,7 +37,6 @@ import java.util.Date; * This interface represents a SetCookie response header sent by the * origin server to the HTTP agent in order to maintain a conversational state. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/SetCookie2.java b/module-client/src/main/java/org/apache/http/cookie/SetCookie2.java index c2b09bfeb..09c0ecac2 100644 --- a/module-client/src/main/java/org/apache/http/cookie/SetCookie2.java +++ b/module-client/src/main/java/org/apache/http/cookie/SetCookie2.java @@ -35,7 +35,6 @@ package org.apache.http.cookie; * This interface represents a SetCookie2 response header sent by the * origin server to the HTTP agent in order to maintain a conversational state. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java b/module-client/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java index 60df640d5..6cd6eaf3c 100644 --- a/module-client/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java +++ b/module-client/src/main/java/org/apache/http/cookie/params/CookieSpecPNames.java @@ -34,7 +34,6 @@ package org.apache.http.cookie.params; /** * Parameter names for cookie specifications in HttpCookie. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java b/module-client/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java index 72fa080c4..b58c227cf 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/AuthSchemeBase.java @@ -45,7 +45,6 @@ import org.apache.http.util.CharArrayBuffer; * does not make any assumptions regarding the format of the challenge * nor does it impose any specific way of responding to that challenge. * - * @author Oleg Kalnichevski */ public abstract class AuthSchemeBase implements AuthScheme { diff --git a/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java b/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java index b8a37c53b..dda4f6829 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/BasicScheme.java @@ -47,14 +47,6 @@ import org.apache.http.util.EncodingUtils; * Basic authentication scheme as defined in RFC 2617. *

* - * @author Remy Maucherat - * @author Rodney Waldhoff - * @author Jeff Dever - * @author Ortwin Glueck - * @author Sean C. Sullivan - * @author Adrian Sutton - * @author Mike Bowler - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java b/module-client/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java index 08e61426d..29c3903ea 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/BasicSchemeFactory.java @@ -37,7 +37,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java b/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java index b4e03b53d..d841122d6 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/DigestScheme.java @@ -67,14 +67,6 @@ import org.apache.http.util.EncodingUtils; * http element charset}. *

* - * @author Remy Maucherat - * @author Rodney Waldhoff - * @author Jeff Dever - * @author Ortwin Glueck - * @author Sean C. Sullivan - * @author Adrian Sutton - * @author Mike Bowler - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java b/module-client/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java index cf6f77601..20d513467 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/DigestSchemeFactory.java @@ -37,7 +37,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java b/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java index dff51956e..d9c9a2e0d 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngine.java @@ -37,7 +37,6 @@ package org.apache.http.impl.auth; *

* For details see this resource * - * @author Oleg Kalnichevski */ public interface NTLMEngine { diff --git a/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java b/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java index 25c0990b5..cb13a2ada 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/NTLMEngineException.java @@ -35,7 +35,6 @@ import org.apache.http.auth.AuthenticationException; /** * Signals NTLM protocol failure. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java b/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java index 3d3e94bc4..4c7507f2b 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/RFC2617Scheme.java @@ -46,7 +46,6 @@ import org.apache.http.util.CharArrayBuffer; * RFC 2617 compliant authetication schemes and provides capabilities common * to all authentication schemes defined in RFC 2617. * - * @author Oleg Kalnichevski */ public abstract class RFC2617Scheme extends AuthSchemeBase { diff --git a/module-client/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java b/module-client/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java index 178d62e83..252ffff43 100644 --- a/module-client/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java +++ b/module-client/src/main/java/org/apache/http/impl/auth/UnsupportedDigestAlgorithmException.java @@ -34,7 +34,6 @@ package org.apache.http.impl.auth; * Authentication credentials required to respond to a authentication * challenge are invalid * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java b/module-client/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java index 0ae37bb51..d9cbc1730 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/AbstractAuthenticationHandler.java @@ -53,7 +53,6 @@ import org.apache.http.protocol.HttpContext; import org.apache.http.util.CharArrayBuffer; /** - * @author Oleg Kalnichevski */ public abstract class AbstractAuthenticationHandler implements AuthenticationHandler { diff --git a/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java b/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java index 0c97c5884..34b0bc17d 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java +++ b/module-client/src/main/java/org/apache/http/impl/client/AbstractHttpClient.java @@ -71,8 +71,6 @@ import org.apache.http.protocol.HttpRequestExecutor; /** * Convenience base class for HTTP client implementations. * - * @author Roland Weber - * @author Oleg Kalnichevski * * * @version $Revision$ diff --git a/module-client/src/main/java/org/apache/http/impl/client/BasicCookieStore.java b/module-client/src/main/java/org/apache/http/impl/client/BasicCookieStore.java index 2bb84b9d6..7d49f624b 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/BasicCookieStore.java +++ b/module-client/src/main/java/org/apache/http/impl/client/BasicCookieStore.java @@ -44,14 +44,6 @@ import org.apache.http.cookie.CookieIdentityComparator; /** * Default implementation of {@link CookieStore} * - * @author Remy Maucherat - * @author Rodney Waldhoff - * @author Jeff Dever - * @author Sean C. Sullivan - * @author Michael Becke - * @author Oleg Kalnichevski - * @author Mike Bowler - * @author Adrian Sutton * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java b/module-client/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java index 038842b98..5844f4c1f 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java +++ b/module-client/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java @@ -39,14 +39,6 @@ import org.apache.http.client.CredentialsProvider; /** * Default implementation of {@link CredentialsProvider} * - * @author Remy Maucherat - * @author Rodney Waldhoff - * @author Jeff Dever - * @author Sean C. Sullivan - * @author Michael Becke - * @author Oleg Kalnichevski - * @author Mike Bowler - * @author Adrian Sutton * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java b/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java index df903c748..27dbd04e2 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/BasicResponseHandler.java @@ -50,7 +50,6 @@ import org.apache.http.util.EntityUtils; * org.apache.http.client.methods.HttpUriRequest, ResponseHandler)}, * HttpClient may handle redirects (3xx responses) internally. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/impl/client/ClientParamsStack.java b/module-client/src/main/java/org/apache/http/impl/client/ClientParamsStack.java index 3aad7f012..e3a62c333 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/ClientParamsStack.java +++ b/module-client/src/main/java/org/apache/http/impl/client/ClientParamsStack.java @@ -70,7 +70,6 @@ import org.apache.http.params.AbstractHttpParams; * an empty params collection, since it avoids searching the empty collection * when looking up parameters. * - * @author Roland Weber * * * @version $Revision$ diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java index c7641d210..30f416561 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultConnectionKeepAliveStrategy.java @@ -45,7 +45,6 @@ import org.apache.http.protocol.HttpContext; * The default implementation looks solely at the 'Keep-Alive' * header's timeout token. * - * @author Sam Berlin * * @version $Revision: $ * diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java index 43641f7cf..e4006cd38 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpClient.java @@ -90,8 +90,6 @@ import org.apache.http.util.VersionInfo; *
* This class replaces HttpClient in HttpClient 3. * - * @author Roland Weber - * @author Oleg Kalnichevski * * * @version $Revision$ diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java index d42be605e..c630d27b2 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultHttpRequestRetryHandler.java @@ -46,8 +46,6 @@ import org.apache.http.protocol.ExecutionContext; /** * The default {@link HttpRequestRetryHandler} used by request executors. * - * @author Michael Becke - * @author Oleg Kalnichevski */ public class DefaultHttpRequestRetryHandler implements HttpRequestRetryHandler { diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java index 9a7cb99f2..4a531b838 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultProxyAuthenticationHandler.java @@ -41,7 +41,6 @@ import org.apache.http.auth.MalformedChallengeException; import org.apache.http.protocol.HttpContext; /** - * @author Oleg Kalnichevski */ public class DefaultProxyAuthenticationHandler extends AbstractAuthenticationHandler { diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java index 192d72d8a..c2168eebf 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultRedirectHandler.java @@ -54,7 +54,6 @@ import org.apache.http.protocol.ExecutionContext; /** * Default implementation of {@link RedirectHandler}. * - * @author Oleg Kalnichevski * * * diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java index 752259ddf..960bb8aaa 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultRequestDirector.java @@ -97,8 +97,6 @@ import org.apache.http.protocol.HttpRequestExecutor; *
* This class replaces the HttpMethodDirector in HttpClient 3. * - * @author Roland Weber - * @author Oleg Kalnichevski * * * @version $Revision$ diff --git a/module-client/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java b/module-client/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java index 4a8fc6b2c..9d61739ab 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/client/DefaultTargetAuthenticationHandler.java @@ -41,7 +41,6 @@ import org.apache.http.auth.MalformedChallengeException; import org.apache.http.protocol.HttpContext; /** - * @author Oleg Kalnichevski */ public class DefaultTargetAuthenticationHandler extends AbstractAuthenticationHandler { diff --git a/module-client/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java b/module-client/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java index c143c0104..f839538fb 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java +++ b/module-client/src/main/java/org/apache/http/impl/client/EntityEnclosingRequestWrapper.java @@ -45,7 +45,6 @@ import org.apache.http.protocol.HTTP; * This class is also capable of resetting the request headers to * the state of the original request. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java b/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java index 3c2331965..15f0d07ca 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java +++ b/module-client/src/main/java/org/apache/http/impl/client/RequestWrapper.java @@ -51,7 +51,6 @@ import org.apache.http.params.HttpProtocolParams; * This class is also capable of resetting the request headers to * the state of the original request. * - * @author Oleg Kalnichevski * * @version $Revision$ * diff --git a/module-client/src/main/java/org/apache/http/impl/client/RoutedRequest.java b/module-client/src/main/java/org/apache/http/impl/client/RoutedRequest.java index a3ba08af8..b9df1581b 100644 --- a/module-client/src/main/java/org/apache/http/impl/client/RoutedRequest.java +++ b/module-client/src/main/java/org/apache/http/impl/client/RoutedRequest.java @@ -37,7 +37,6 @@ import org.apache.http.conn.routing.HttpRoute; /** * A request with the route along which it should be sent. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java b/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java index c9486e3a5..60f9d2311 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/AbstractClientConnAdapter.java @@ -69,7 +69,6 @@ import org.apache.http.conn.ClientConnectionManager; * clear the reusability mark first. The connection manager is * expected to tolerate multiple calls to the release method. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java b/module-client/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java index 9f23820f8..006c43ff2 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/AbstractPoolEntry.java @@ -57,8 +57,6 @@ import org.apache.http.conn.OperatedClientConnection; * gets disconnected, but the pool entry still contains the * underlying connection and the established route. * - * @author Roland Weber - * @author Michael Becke * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java b/module-client/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java index 68b6abd19..5ba8ec834 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/AbstractPooledConnAdapter.java @@ -52,7 +52,6 @@ import org.apache.http.conn.OperatedClientConnection; * will clear the tracked route in the pool entry and call the * respective method of the wrapped connection. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java index d0f24a15a..c94406f71 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnection.java @@ -55,7 +55,6 @@ import org.apache.http.conn.OperatedClientConnection; /** * Default implementation of an operated client connection. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java index fba4eecce..741acb46e 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/DefaultClientConnectionOperator.java @@ -56,7 +56,6 @@ import org.apache.http.conn.scheme.SocketFactory; * It uses a {@link SchemeRegistry SchemeRegistry} to look up * {@link SocketFactory SocketFactory} objects. * - * @author Roland Weber * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java index 6c2e15d7c..80cecbec0 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionInputBuffer.java @@ -39,9 +39,6 @@ import org.apache.http.util.CharArrayBuffer; /** * Logs all data read to the wire LOG. * - * @author Ortwin Glueck - * @author Mike Bowler - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java index ef55c4bde..d831d56fd 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/LoggingSessionOutputBuffer.java @@ -39,7 +39,6 @@ import org.apache.http.util.CharArrayBuffer; /** * Logs all data written to the wire LOG. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java b/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java index 63a68ecf5..86e334f27 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/SingleClientConnManager.java @@ -58,8 +58,6 @@ import org.apache.http.params.HttpParams; * in HttpClient 3. See there for original authors. *

* - * @author Roland Weber - * @author Michael Becke * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/Wire.java b/module-client/src/main/java/org/apache/http/impl/conn/Wire.java index 4812d0123..6f3d68f2a 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/Wire.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/Wire.java @@ -38,7 +38,6 @@ import org.apache.commons.logging.Log; /** * Logs data to the wire LOG. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java index 0c70b98a7..79c41f836 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ConnPoolByRoute.java @@ -62,9 +62,6 @@ import org.apache.http.params.HttpParams; * {@link AbstractConnPool#poolLock poolLock} in the base class, * not via synchronized methods. * - * @author Roland Weber - * @author Michael Becke - * @author and others */ public class ConnPoolByRoute extends AbstractConnPool { diff --git a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java index ad635fa1f..c2193c4a8 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/ThreadSafeClientConnManager.java @@ -55,8 +55,6 @@ import org.apache.http.impl.conn.DefaultClientConnectionOperator; * in HttpClient 3. See there for original authors. *

* - * @author Roland Weber - * @author Michael Becke * * * diff --git a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java index af3845257..4dbdb07de 100644 --- a/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java +++ b/module-client/src/main/java/org/apache/http/impl/conn/tsccm/WaitingThread.java @@ -45,7 +45,6 @@ import java.util.concurrent.locks.Condition; * passed to the constructor. * Instances of this class do not synchronize access! * - * @author Roland Weber */ public class WaitingThread { diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java b/module-client/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java index 399b7676a..46535f8eb 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/AbstractCookieSpec.java @@ -43,7 +43,6 @@ import org.apache.http.cookie.CookieSpec; * validation or matching cookie attributes to a number of arbitrary * {@link CookieAttributeHandler}s. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java b/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java index 072a8e417..852fe9342 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie.java @@ -44,16 +44,6 @@ import org.apache.http.cookie.SetCookie; * that the HTTP agent and the target server can exchange to maintain * a session. * - * @author B.C. Holmes - * @author Park, Sung-Gu - * @author Doug Sale - * @author Rod Waldhoff - * @author dIon Gillard - * @author Sean C. Sullivan - * @author John Evans - * @author Marc A. Saegesser - * @author Oleg Kalnichevski - * @author Mike Bowler * * @version $Revision$ */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java b/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java index 87dfe051a..875851864 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/BasicClientCookie2.java @@ -40,7 +40,6 @@ import org.apache.http.cookie.SetCookie2; * that the HTTP agent and the target server can exchange to maintain * a session as specified by RFC2965. * - * @author Oleg Kalnichevski */ public class BasicClientCookie2 extends BasicClientCookie implements SetCookie2 { diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java b/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java index 2e1c332e0..1d0b8b8e2 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpec.java @@ -46,7 +46,6 @@ import org.apache.http.cookie.SetCookie2; * 'Meta' cookie specification that selects a cookie policy depending * on the format of the cookie(s) * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java b/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java index 19f429bc6..d074c52a5 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/BestMatchSpecFactory.java @@ -38,7 +38,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java b/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java index 0fa05bb08..5af460ea4 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpec.java @@ -52,7 +52,6 @@ import org.apache.http.util.CharArrayBuffer; * common web browser applications such as Microsoft Internet Explorer * and Mozilla FireFox. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java b/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java index 3f1c95e39..b66e1dcf1 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/BrowserCompatSpecFactory.java @@ -38,7 +38,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java b/module-client/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java index 96626afb1..d1f25478c 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/CookieSpecBase.java @@ -45,7 +45,6 @@ import org.apache.http.cookie.MalformedCookieException; /** * Cookie management functions shared by all specification. * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/DateParseException.java b/module-client/src/main/java/org/apache/http/impl/cookie/DateParseException.java index f642ab115..875de7603 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/DateParseException.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/DateParseException.java @@ -37,7 +37,6 @@ package org.apache.http.impl.cookie; * * @see DateUtils * - * @author Michael Becke */ public class DateParseException extends Exception { diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/DateUtils.java b/module-client/src/main/java/org/apache/http/impl/cookie/DateUtils.java index 141ae4e25..e059e9f15 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/DateUtils.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/DateUtils.java @@ -46,8 +46,6 @@ import java.util.TimeZone; * other headers. This class handles dates as defined by RFC 2616 section * 3.3.1 as well as some other common non-standard formats. * - * @author Christopher Brown - * @author Michael Becke */ public final class DateUtils { @@ -210,7 +208,6 @@ public final class DateUtils { * threadlocal way because SimpleDateFormat is not threadsafe as noted in * {@link SimpleDateFormat its javadoc}. * - * @author Daniel Mueller */ final static class DateFormatHolder { diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java b/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java index 8922d9f24..4bf617c29 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpec.java @@ -49,16 +49,6 @@ import org.apache.http.util.CharArrayBuffer; /** * Netscape cookie draft compliant cookie policy * - * @author B.C. Holmes - * @author Park, Sung-Gu - * @author Doug Sale - * @author Rod Waldhoff - * @author dIon Gillard - * @author Sean C. Sullivan - * @author John Evans - * @author Marc A. Saegesser - * @author Oleg Kalnichevski - * @author Mike Bowler * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java b/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java index c20bd847d..ba2147b52 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java @@ -38,7 +38,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java b/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java index 0d0db074b..f71c4f31c 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixFilter.java @@ -1,121 +1,121 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.impl.cookie; - -import java.util.Collection; -import java.util.HashSet; -import java.util.Set; - -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; -import org.apache.http.cookie.MalformedCookieException; -import org.apache.http.cookie.SetCookie; - -/** - * Wraps a CookieAttributeHandler and leverages its match method - * to never match a suffix from a black list. May be used to provide - * additional security for cross-site attack types by preventing - * cookies from apparent domains that are not publicly available. - * An uptodate list of suffixes can be obtained from - * publicsuffix.org - */ -public class PublicSuffixFilter implements CookieAttributeHandler { - private CookieAttributeHandler wrapped; - private Set exceptions; - private Set suffixes; - - public PublicSuffixFilter(CookieAttributeHandler wrapped) { - this.wrapped = wrapped; - } - - /** - * Sets the suffix blacklist patterns. - * A pattern can be "com", "*.jp" - * TODO add support for patterns like "lib.*.us" - * @param suffixes - */ - public void setPublicSuffixes(Collection suffixes) { - this.suffixes = new HashSet(suffixes); - } - - /** - * Sets the exceptions from the blacklist. Exceptions can not be patterns. - * TODO add support for patterns - * @param exceptions - */ - public void setExceptions(Collection exceptions) { - this.exceptions = new HashSet(exceptions); - } - - /** - * Never matches if the cookie's domain is from the blacklist. - */ - public boolean match(Cookie cookie, CookieOrigin origin) { - if (isForPublicSuffix(cookie)) return false; - return wrapped.match(cookie, origin); - } - - public void parse(SetCookie cookie, String value) throws MalformedCookieException { - wrapped.parse(cookie, value); - } - - public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException { - wrapped.validate(cookie, origin); - } - - private boolean isForPublicSuffix(Cookie cookie) { - String domain = cookie.getDomain(); - if (domain.startsWith(".")) domain = domain.substring(1); - domain = Punycode.toUnicode(domain); - - // An exception rule takes priority over any other matching rule. - if (this.exceptions != null) { - if (this.exceptions.contains(domain)) return false; - } - - - if (this.suffixes == null) return false; - - do { - if (this.suffixes.contains(domain)) return true; - // patterns - if (domain.startsWith("*.")) domain = domain.substring(2); - int nextdot = domain.indexOf('.'); - if (nextdot == -1) break; - domain = "*" + domain.substring(nextdot); - } while (domain.length() > 0); - - return false; - } -} +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.impl.cookie; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; + +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; +import org.apache.http.cookie.MalformedCookieException; +import org.apache.http.cookie.SetCookie; + +/** + * Wraps a CookieAttributeHandler and leverages its match method + * to never match a suffix from a black list. May be used to provide + * additional security for cross-site attack types by preventing + * cookies from apparent domains that are not publicly available. + * An uptodate list of suffixes can be obtained from + * publicsuffix.org + */ +public class PublicSuffixFilter implements CookieAttributeHandler { + private CookieAttributeHandler wrapped; + private Set exceptions; + private Set suffixes; + + public PublicSuffixFilter(CookieAttributeHandler wrapped) { + this.wrapped = wrapped; + } + + /** + * Sets the suffix blacklist patterns. + * A pattern can be "com", "*.jp" + * TODO add support for patterns like "lib.*.us" + * @param suffixes + */ + public void setPublicSuffixes(Collection suffixes) { + this.suffixes = new HashSet(suffixes); + } + + /** + * Sets the exceptions from the blacklist. Exceptions can not be patterns. + * TODO add support for patterns + * @param exceptions + */ + public void setExceptions(Collection exceptions) { + this.exceptions = new HashSet(exceptions); + } + + /** + * Never matches if the cookie's domain is from the blacklist. + */ + public boolean match(Cookie cookie, CookieOrigin origin) { + if (isForPublicSuffix(cookie)) return false; + return wrapped.match(cookie, origin); + } + + public void parse(SetCookie cookie, String value) throws MalformedCookieException { + wrapped.parse(cookie, value); + } + + public void validate(Cookie cookie, CookieOrigin origin) throws MalformedCookieException { + wrapped.validate(cookie, origin); + } + + private boolean isForPublicSuffix(Cookie cookie) { + String domain = cookie.getDomain(); + if (domain.startsWith(".")) domain = domain.substring(1); + domain = Punycode.toUnicode(domain); + + // An exception rule takes priority over any other matching rule. + if (this.exceptions != null) { + if (this.exceptions.contains(domain)) return false; + } + + + if (this.suffixes == null) return false; + + do { + if (this.suffixes.contains(domain)) return true; + // patterns + if (domain.startsWith("*.")) domain = domain.substring(2); + int nextdot = domain.indexOf('.'); + if (nextdot == -1) break; + domain = "*" + domain.substring(nextdot); + } while (domain.length() > 0); + + return false; + } +} diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java b/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java index baabf17e5..e25c22c4a 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/PublicSuffixListParser.java @@ -1,108 +1,108 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.impl.cookie; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.Reader; -import java.util.ArrayList; -import java.util.Collection; - -/** - * Parses the list from publicsuffix.org - * and configures a PublicSuffixFilter. - */ -public class PublicSuffixListParser { - private static final int MAX_LINE_LEN = 256; - private PublicSuffixFilter filter; - - PublicSuffixListParser(PublicSuffixFilter filter) { - this.filter = filter; - } - - /** - * Parses the public suffix list format. - * When creating the reader from the file, make sure to - * use the correct encoding (the original list is in UTF-8). - * - * @param list the suffix list. The caller is responsible for closing the reader. - * @throws IOException on error while reading from list - */ - public void parse(Reader list) throws IOException { - Collection rules = new ArrayList(); - Collection exceptions = new ArrayList(); - BufferedReader r = new BufferedReader(list); - StringBuilder sb = new StringBuilder(256); - boolean more = true; - while (more) { - more = readLine(r, sb); - String line = sb.toString(); - if (line.length() == 0) continue; - if (line.startsWith("//")) continue; //entire lines can also be commented using // - if (line.startsWith(".")) line = line.substring(1); // A leading dot is optional - // An exclamation mark (!) at the start of a rule marks an exception to a previous wildcard rule - boolean isException = line.startsWith("!"); - if (isException) line = line.substring(1); - - if (isException) { - exceptions.add(line); - } else { - rules.add(line); - } - } - - filter.setPublicSuffixes(rules); - filter.setExceptions(exceptions); - } - - /** - * - * @param r - * @param sb - * @return false when the end of the stream is reached - * @throws IOException - */ - private boolean readLine(Reader r, StringBuilder sb) throws IOException { - sb.setLength(0); - int b; - boolean hitWhitespace = false; - while ((b = r.read()) != -1) { - char c = (char) b; - if (c == '\n') break; - // Each line is only read up to the first whitespace - if (Character.isWhitespace(c)) hitWhitespace = true; - if (!hitWhitespace) sb.append(c); - if (sb.length() > MAX_LINE_LEN) throw new IOException("Line too long"); // prevent excess memory usage - } - return (b != -1); - } -} +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.impl.cookie; + +import java.io.BufferedReader; +import java.io.IOException; +import java.io.Reader; +import java.util.ArrayList; +import java.util.Collection; + +/** + * Parses the list from publicsuffix.org + * and configures a PublicSuffixFilter. + */ +public class PublicSuffixListParser { + private static final int MAX_LINE_LEN = 256; + private PublicSuffixFilter filter; + + PublicSuffixListParser(PublicSuffixFilter filter) { + this.filter = filter; + } + + /** + * Parses the public suffix list format. + * When creating the reader from the file, make sure to + * use the correct encoding (the original list is in UTF-8). + * + * @param list the suffix list. The caller is responsible for closing the reader. + * @throws IOException on error while reading from list + */ + public void parse(Reader list) throws IOException { + Collection rules = new ArrayList(); + Collection exceptions = new ArrayList(); + BufferedReader r = new BufferedReader(list); + StringBuilder sb = new StringBuilder(256); + boolean more = true; + while (more) { + more = readLine(r, sb); + String line = sb.toString(); + if (line.length() == 0) continue; + if (line.startsWith("//")) continue; //entire lines can also be commented using // + if (line.startsWith(".")) line = line.substring(1); // A leading dot is optional + // An exclamation mark (!) at the start of a rule marks an exception to a previous wildcard rule + boolean isException = line.startsWith("!"); + if (isException) line = line.substring(1); + + if (isException) { + exceptions.add(line); + } else { + rules.add(line); + } + } + + filter.setPublicSuffixes(rules); + filter.setExceptions(exceptions); + } + + /** + * + * @param r + * @param sb + * @return false when the end of the stream is reached + * @throws IOException + */ + private boolean readLine(Reader r, StringBuilder sb) throws IOException { + sb.setLength(0); + int b; + boolean hitWhitespace = false; + while ((b = r.read()) != -1) { + char c = (char) b; + if (c == '\n') break; + // Each line is only read up to the first whitespace + if (Character.isWhitespace(c)) hitWhitespace = true; + if (!hitWhitespace) sb.append(c); + if (sb.length() > MAX_LINE_LEN) throw new IOException("Line too long"); // prevent excess memory usage + } + return (b != -1); + } +} diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java index 4a0e0e59c..6b7876c12 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109Spec.java @@ -49,16 +49,6 @@ import org.apache.http.util.CharArrayBuffer; /** * RFC 2109 compliant cookie policy * - * @author B.C. Holmes - * @author Park, Sung-Gu - * @author Doug Sale - * @author Rod Waldhoff - * @author dIon Gillard - * @author Sean C. Sullivan - * @author John Evans - * @author Marc A. Saegesser - * @author Oleg Kalnichevski - * @author Mike Bowler * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java index 12e6feefd..da168f095 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2109SpecFactory.java @@ -38,7 +38,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java index d2819c9bc..91d31a5fc 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965DomainAttributeHandler.java @@ -43,7 +43,6 @@ import org.apache.http.cookie.SetCookie; /** * "Domain" cookie attribute handler for RFC 2965 cookie spec. * - * @author jain.samit@gmail.com (Samit Jain) * * @since 3.1 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java index 140e56a36..ef686fb7b 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965Spec.java @@ -51,8 +51,6 @@ import org.apache.http.util.CharArrayBuffer; /** *

RFC 2965 specific cookie management functions.

* - * @author jain.samit@gmail.com (Samit Jain) - * @author Oleg Kalnichevski * * @since 3.1 */ diff --git a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java index 87113cf41..1916d2854 100644 --- a/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java +++ b/module-client/src/main/java/org/apache/http/impl/cookie/RFC2965SpecFactory.java @@ -38,7 +38,6 @@ import org.apache.http.params.HttpParams; /** * - * @author Oleg Kalnichevski * * @since 4.0 */ diff --git a/module-client/src/test/java/org/apache/http/client/utils/TestRfc3492Idn.java b/module-client/src/test/java/org/apache/http/client/utils/TestRfc3492Idn.java index 74ca4b9fd..120e396b2 100644 --- a/module-client/src/test/java/org/apache/http/client/utils/TestRfc3492Idn.java +++ b/module-client/src/test/java/org/apache/http/client/utils/TestRfc3492Idn.java @@ -1,95 +1,95 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.client.utils; - -import org.apache.http.client.utils.Rfc3492Idn; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -public class TestRfc3492Idn extends TestCase { - public TestRfc3492Idn(String testName) { - super(testName); - } - - public static void main(String args[]) { - String[] testCaseName = { TestRfc3492Idn.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public static Test suite() { - return new TestSuite(TestRfc3492Idn.class); - } - - /** - * Some of the sample strings from RFC 3492 - */ - public void testDecode() throws Exception { - Rfc3492Idn idn = new Rfc3492Idn(); - // (A) Arabic - assertEquals("\u0644\u064A\u0647\u0645\u0627\u0628\u062A\u0643\u0644" + - "\u0645\u0648\u0634\u0639\u0631\u0628\u064A\u061F", - idn.decode("egbpdaj6bu4bxfgehfvwxn")); - - // (B) Chinese (simplified) - assertEquals("\u4ED6\u4EEC\u4E3A\u4EC0\u4E48\u4E0D\u8BF4\u4E2D\u6587", - idn.decode("ihqwcrb4cv8a8dqg056pqjye")); - - // (I) Russian (Cyrillic) - assertEquals("\u043F\u043E\u0447\u0435\u043C\u0443\u0436\u0435\u043E"+ - "\u043D\u0438\u043D\u0435\u0433\u043E\u0432\u043E\u0440"+ - "\u044F\u0442\u043F\u043E\u0440\u0443\u0441\u0441\u043A"+ - "\u0438", - idn.decode("b1abfaaepdrnnbgefbaDotcwatmq2g4l")); - - // (P) MajiKoi5 - assertEquals("\u004D\u0061\u006A\u0069\u3067\u004B\u006F\u0069\u3059" + - "\u308B\u0035\u79D2\u524D", - idn.decode("MajiKoi5-783gue6qz075azm5e")); - - } - - public void testToUnicode() throws Exception { - Rfc3492Idn idn = new Rfc3492Idn(); - // (A) Arabic - assertEquals("\u0644\u064A\u0647\u0645\u0627\u0628\u062A\u0643\u0644" + - "\u0645\u0648\u0634\u0639\u0631\u0628\u064A\u061F", - idn.toUnicode("xn--egbpdaj6bu4bxfgehfvwxn")); - - // some real-world domains - assertEquals("www.z\u00fcrich.ch", - idn.toUnicode("www.xn--zrich-kva.ch")); - - assertEquals("www.g\u00e4ggelig\u00e4\u00e4l.ch", - idn.toUnicode("www.xn--gggeligl-0zaga.ch")); - } -} +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.client.utils; + +import org.apache.http.client.utils.Rfc3492Idn; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +public class TestRfc3492Idn extends TestCase { + public TestRfc3492Idn(String testName) { + super(testName); + } + + public static void main(String args[]) { + String[] testCaseName = { TestRfc3492Idn.class.getName() }; + junit.textui.TestRunner.main(testCaseName); + } + + public static Test suite() { + return new TestSuite(TestRfc3492Idn.class); + } + + /** + * Some of the sample strings from RFC 3492 + */ + public void testDecode() throws Exception { + Rfc3492Idn idn = new Rfc3492Idn(); + // (A) Arabic + assertEquals("\u0644\u064A\u0647\u0645\u0627\u0628\u062A\u0643\u0644" + + "\u0645\u0648\u0634\u0639\u0631\u0628\u064A\u061F", + idn.decode("egbpdaj6bu4bxfgehfvwxn")); + + // (B) Chinese (simplified) + assertEquals("\u4ED6\u4EEC\u4E3A\u4EC0\u4E48\u4E0D\u8BF4\u4E2D\u6587", + idn.decode("ihqwcrb4cv8a8dqg056pqjye")); + + // (I) Russian (Cyrillic) + assertEquals("\u043F\u043E\u0447\u0435\u043C\u0443\u0436\u0435\u043E"+ + "\u043D\u0438\u043D\u0435\u0433\u043E\u0432\u043E\u0440"+ + "\u044F\u0442\u043F\u043E\u0440\u0443\u0441\u0441\u043A"+ + "\u0438", + idn.decode("b1abfaaepdrnnbgefbaDotcwatmq2g4l")); + + // (P) MajiKoi5 + assertEquals("\u004D\u0061\u006A\u0069\u3067\u004B\u006F\u0069\u3059" + + "\u308B\u0035\u79D2\u524D", + idn.decode("MajiKoi5-783gue6qz075azm5e")); + + } + + public void testToUnicode() throws Exception { + Rfc3492Idn idn = new Rfc3492Idn(); + // (A) Arabic + assertEquals("\u0644\u064A\u0647\u0645\u0627\u0628\u062A\u0643\u0644" + + "\u0645\u0648\u0634\u0639\u0631\u0628\u064A\u061F", + idn.toUnicode("xn--egbpdaj6bu4bxfgehfvwxn")); + + // some real-world domains + assertEquals("www.z\u00fcrich.ch", + idn.toUnicode("www.xn--zrich-kva.ch")); + + assertEquals("www.g\u00e4ggelig\u00e4\u00e4l.ch", + idn.toUnicode("www.xn--gggeligl-0zaga.ch")); + } +} diff --git a/module-client/src/test/java/org/apache/http/conn/TestScheme.java b/module-client/src/test/java/org/apache/http/conn/TestScheme.java index 800e15386..b52671e70 100644 --- a/module-client/src/test/java/org/apache/http/conn/TestScheme.java +++ b/module-client/src/test/java/org/apache/http/conn/TestScheme.java @@ -48,8 +48,6 @@ import org.apache.http.mockup.SecureSocketFactoryMockup; /** * Unit tests for {@link Scheme} and {@link SchemeRegistry}. * - * @author Roland Weber - * @author Oleg Kalnichevski */ public class TestScheme extends TestCase { diff --git a/module-client/src/test/java/org/apache/http/conn/ssl/CertificatesToPlayWith.java b/module-client/src/test/java/org/apache/http/conn/ssl/CertificatesToPlayWith.java index 0aeebb05a..9bd761b86 100644 --- a/module-client/src/test/java/org/apache/http/conn/ssl/CertificatesToPlayWith.java +++ b/module-client/src/test/java/org/apache/http/conn/ssl/CertificatesToPlayWith.java @@ -41,7 +41,6 @@ package org.apache.http.conn.ssl; * find 花子.co.jp. So would the CN in the certificate contain * "xn--i8s592g.co.jp" in ASCII, or "花子.co.jp" in UTF8? (Both?) * - * @author Julius Davies * @since 11-Dec-2006 */ public interface CertificatesToPlayWith { diff --git a/module-client/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java b/module-client/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java index cb371e700..369114a10 100644 --- a/module-client/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java +++ b/module-client/src/test/java/org/apache/http/conn/ssl/TestHostnameVerifier.java @@ -45,7 +45,6 @@ import junit.framework.TestSuite; /** * Unit tests for {@link X509HostnameVerifier}. * - * @author Julius Davies * @since 11-Dec-2006 */ public class TestHostnameVerifier extends TestCase diff --git a/module-client/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java b/module-client/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java index 02f7bdb18..52201a93e 100644 --- a/module-client/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java +++ b/module-client/src/test/java/org/apache/http/conn/ssl/TestSSLSocketFactory.java @@ -65,7 +65,6 @@ import org.apache.http.localserver.LocalTestServer; /** * Unit tests for {@link SSLSocketFactory}. * - * @author Julius Davies * @since 8-Dec-2006 */ public class TestSSLSocketFactory extends TestCase diff --git a/module-client/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java b/module-client/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java index 04022ea73..a94656e94 100644 --- a/module-client/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java +++ b/module-client/src/test/java/org/apache/http/impl/auth/TestDigestScheme.java @@ -51,9 +51,6 @@ import org.apache.http.message.BasicHttpRequest; /** * Test Methods for DigestScheme Authentication. * - * @author Rodney Waldhoff - * @author Jeff Dever - * @author Oleg Kalnichevski */ public class TestDigestScheme extends TestCase { diff --git a/module-client/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java b/module-client/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java index c96459bbf..b78da3258 100644 --- a/module-client/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java +++ b/module-client/src/test/java/org/apache/http/impl/client/TestBasicCredentialsProvider.java @@ -38,10 +38,6 @@ import junit.framework.*; * * Simple tests for {@link BasicCredentialsProvider}. * - * @author Rodney Waldhoff - * @author Jeff Dever - * @author Sean C. Sullivan - * @author Oleg Kalnichevski * * @version $Id$ * diff --git a/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java b/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java index e210d61f4..504d857bd 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/ExecReqThread.java @@ -45,8 +45,6 @@ import org.apache.http.util.EntityUtils; /** * Executes a request from a new thread. * - * @author Michael Becke - * @author Roland Weber (rolandw at apache.org) */ public class ExecReqThread extends GetConnThread { diff --git a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java index df3a0c3f0..9f60d495e 100644 --- a/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java +++ b/module-client/src/test/java/org/apache/http/impl/conn/tsccm/TestSpuriousWakeup.java @@ -64,7 +64,6 @@ import org.apache.http.impl.conn.GetConnThread; * which is required to trigger a wakeup without actually * satisfying the condition. * - * @author Roland Weber */ public class TestSpuriousWakeup extends TestCase { diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java index f670ab291..916504388 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestBrowserCompatSpec.java @@ -50,12 +50,6 @@ import org.apache.http.message.BasicHeader; /** * Test cases for BrowserCompatSpec * - * @author BC Holmes - * @author Rod Waldhoff - * @author dIon Gillard - * @author John Evans - * @author Marc A. Saegesser - * @author Oleg Kalnichevski * @version $Revision$ */ public class TestBrowserCompatSpec extends TestCase { diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieBestMatchSpec.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieBestMatchSpec.java index dea666e0c..ee6b7852e 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieBestMatchSpec.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieBestMatchSpec.java @@ -49,7 +49,6 @@ import org.apache.http.message.BasicHeader; /** * Test cases for 'best match' cookie policy * - * @author Oleg Kalnichevski * * @version $Revision$ */ diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java index ed4edc029..9396a05cb 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieNetscapeDraft.java @@ -48,7 +48,6 @@ import org.apache.http.message.BasicHeader; /** * Test cases for Netscape cookie draft * - * @author Oleg Kalnichevski * * @version $Revision$ */ diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java index d9cc76e5f..f84aa6ebe 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2109Spec.java @@ -49,7 +49,6 @@ import org.apache.http.message.BasicHeader; /** * Test cases for RFC2109 cookie spec * - * @author Oleg Kalnichevski * * @version $Revision$ */ diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java index b18ef9a25..533c73e90 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestCookieRFC2965Spec.java @@ -48,7 +48,6 @@ import org.apache.http.message.BasicHeader; /** * Test cases for RFC2965 cookie spec * - * @author jain.samit@gmail.com (Samit Jain) */ public class TestCookieRFC2965Spec extends TestCase { diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestDateUtils.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestDateUtils.java index 043db3bb3..577fb1ede 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestDateUtils.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestDateUtils.java @@ -41,7 +41,6 @@ import junit.framework.TestSuite; /** * Unit tests for {@link DateUtils}. * - * @author Oleg Kalnichevski */ public class TestDateUtils extends TestCase { diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestNetscapeDraftHeaderParser.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestNetscapeDraftHeaderParser.java index f8b491f14..7bf21d5f1 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestNetscapeDraftHeaderParser.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestNetscapeDraftHeaderParser.java @@ -43,7 +43,6 @@ import junit.framework.TestSuite; /** * Unit tests for {@link NetscapeDraftHeaderParser}. * - * @author Oleg Kalnichevski */ public class TestNetscapeDraftHeaderParser extends TestCase { diff --git a/module-client/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java b/module-client/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java index 5fdc847c8..31c5ffacc 100644 --- a/module-client/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java +++ b/module-client/src/test/java/org/apache/http/impl/cookie/TestPublicSuffixListParser.java @@ -1,115 +1,115 @@ -/* - * $HeadURL$ - * $Revision$ - * $Date$ - * - * ==================================================================== - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - * ==================================================================== - * - * This software consists of voluntary contributions made by many - * individuals on behalf of the Apache Software Foundation. For more - * information on the Apache Software Foundation, please see - * . - * - */ - -package org.apache.http.impl.cookie; - -import java.io.IOException; -import java.io.InputStreamReader; -import java.io.Reader; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestSuite; - -import org.apache.http.cookie.CookieOrigin; - -public class TestPublicSuffixListParser extends TestCase { - private static final String LIST_FILE = "/suffixlist.txt"; - private PublicSuffixFilter filter; - - public TestPublicSuffixListParser(String testName) { - super(testName); - try { - Reader r = new InputStreamReader(getClass().getResourceAsStream(LIST_FILE), "UTF-8"); - filter = new PublicSuffixFilter(new RFC2109DomainHandler()); - PublicSuffixListParser parser = new PublicSuffixListParser(filter); - parser.parse(r); - } catch (IOException e) { - throw new RuntimeException(e.getMessage(), e); - } - } - - public static Test suite() { - return new TestSuite(TestPublicSuffixListParser.class); - } - - public static void main(String args[]) { - String[] testCaseName = { TestPublicSuffixListParser.class.getName() }; - junit.textui.TestRunner.main(testCaseName); - } - - public void testParse() throws Exception { - BasicClientCookie cookie = new BasicClientCookie("name", "value"); - - cookie.setDomain(".jp"); - assertFalse(filter.match(cookie, new CookieOrigin("apache.jp", 80, "/stuff", false))); - - cookie.setDomain(".ac.jp"); - assertFalse(filter.match(cookie, new CookieOrigin("apache.ac.jp", 80, "/stuff", false))); - - cookie.setDomain(".any.tokyo.jp"); - assertFalse(filter.match(cookie, new CookieOrigin("apache.any.tokyo.jp", 80, "/stuff", false))); - - // exception - cookie.setDomain(".metro.tokyo.jp"); - assertTrue(filter.match(cookie, new CookieOrigin("apache.metro.tokyo.jp", 80, "/stuff", false))); - } - - public void testUnicode() throws Exception { - BasicClientCookie cookie = new BasicClientCookie("name", "value"); - - cookie.setDomain(".h\u00E5.no"); // \u00E5 is - assertFalse(filter.match(cookie, new CookieOrigin("apache.h\u00E5.no", 80, "/stuff", false))); - - cookie.setDomain(".xn--h-2fa.no"); - assertFalse(filter.match(cookie, new CookieOrigin("apache.xn--h-2fa.no", 80, "/stuff", false))); - - cookie.setDomain(".h\u00E5.no"); - assertFalse(filter.match(cookie, new CookieOrigin("apache.xn--h-2fa.no", 80, "/stuff", false))); - - cookie.setDomain(".xn--h-2fa.no"); - assertFalse(filter.match(cookie, new CookieOrigin("apache.h\u00E5.no", 80, "/stuff", false))); - } - - public void testWhitespace() throws Exception { - BasicClientCookie cookie = new BasicClientCookie("name", "value"); - cookie.setDomain(".xx"); - assertFalse(filter.match(cookie, new CookieOrigin("apache.xx", 80, "/stuff", false))); - - // yy appears after whitespace - cookie.setDomain(".yy"); - assertTrue(filter.match(cookie, new CookieOrigin("apache.yy", 80, "/stuff", false))); - - // zz is commented - cookie.setDomain(".zz"); - assertTrue(filter.match(cookie, new CookieOrigin("apache.zz", 80, "/stuff", false))); - } -} +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.http.impl.cookie; + +import java.io.IOException; +import java.io.InputStreamReader; +import java.io.Reader; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestSuite; + +import org.apache.http.cookie.CookieOrigin; + +public class TestPublicSuffixListParser extends TestCase { + private static final String LIST_FILE = "/suffixlist.txt"; + private PublicSuffixFilter filter; + + public TestPublicSuffixListParser(String testName) { + super(testName); + try { + Reader r = new InputStreamReader(getClass().getResourceAsStream(LIST_FILE), "UTF-8"); + filter = new PublicSuffixFilter(new RFC2109DomainHandler()); + PublicSuffixListParser parser = new PublicSuffixListParser(filter); + parser.parse(r); + } catch (IOException e) { + throw new RuntimeException(e.getMessage(), e); + } + } + + public static Test suite() { + return new TestSuite(TestPublicSuffixListParser.class); + } + + public static void main(String args[]) { + String[] testCaseName = { TestPublicSuffixListParser.class.getName() }; + junit.textui.TestRunner.main(testCaseName); + } + + public void testParse() throws Exception { + BasicClientCookie cookie = new BasicClientCookie("name", "value"); + + cookie.setDomain(".jp"); + assertFalse(filter.match(cookie, new CookieOrigin("apache.jp", 80, "/stuff", false))); + + cookie.setDomain(".ac.jp"); + assertFalse(filter.match(cookie, new CookieOrigin("apache.ac.jp", 80, "/stuff", false))); + + cookie.setDomain(".any.tokyo.jp"); + assertFalse(filter.match(cookie, new CookieOrigin("apache.any.tokyo.jp", 80, "/stuff", false))); + + // exception + cookie.setDomain(".metro.tokyo.jp"); + assertTrue(filter.match(cookie, new CookieOrigin("apache.metro.tokyo.jp", 80, "/stuff", false))); + } + + public void testUnicode() throws Exception { + BasicClientCookie cookie = new BasicClientCookie("name", "value"); + + cookie.setDomain(".h\u00E5.no"); // \u00E5 is + assertFalse(filter.match(cookie, new CookieOrigin("apache.h\u00E5.no", 80, "/stuff", false))); + + cookie.setDomain(".xn--h-2fa.no"); + assertFalse(filter.match(cookie, new CookieOrigin("apache.xn--h-2fa.no", 80, "/stuff", false))); + + cookie.setDomain(".h\u00E5.no"); + assertFalse(filter.match(cookie, new CookieOrigin("apache.xn--h-2fa.no", 80, "/stuff", false))); + + cookie.setDomain(".xn--h-2fa.no"); + assertFalse(filter.match(cookie, new CookieOrigin("apache.h\u00E5.no", 80, "/stuff", false))); + } + + public void testWhitespace() throws Exception { + BasicClientCookie cookie = new BasicClientCookie("name", "value"); + cookie.setDomain(".xx"); + assertFalse(filter.match(cookie, new CookieOrigin("apache.xx", 80, "/stuff", false))); + + // yy appears after whitespace + cookie.setDomain(".yy"); + assertTrue(filter.match(cookie, new CookieOrigin("apache.yy", 80, "/stuff", false))); + + // zz is commented + cookie.setDomain(".zz"); + assertTrue(filter.match(cookie, new CookieOrigin("apache.zz", 80, "/stuff", false))); + } +} diff --git a/module-client/src/test/java/org/apache/http/localserver/EchoHandler.java b/module-client/src/test/java/org/apache/http/localserver/EchoHandler.java index 24c70f6e8..31f0859b1 100644 --- a/module-client/src/test/java/org/apache/http/localserver/EchoHandler.java +++ b/module-client/src/test/java/org/apache/http/localserver/EchoHandler.java @@ -51,8 +51,6 @@ import org.apache.http.util.EntityUtils; /** * A handler that echos the incoming request entity. * - * @author Roland Weber - * @author Oleg Kalnichevski * * * diff --git a/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java b/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java index 244f33f65..3b1b2e620 100644 --- a/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java +++ b/module-client/src/test/java/org/apache/http/localserver/LocalTestServer.java @@ -69,8 +69,6 @@ import org.apache.http.protocol.ResponseServer; * Local HTTP server for tests that require one. * Based on the ElementalHttpServer example in HttpCore. * - * @author Roland Weber - * @author Oleg Kalnichevski * * * diff --git a/module-client/src/test/java/org/apache/http/localserver/RandomHandler.java b/module-client/src/test/java/org/apache/http/localserver/RandomHandler.java index 57f8d6ba1..3c1819b04 100644 --- a/module-client/src/test/java/org/apache/http/localserver/RandomHandler.java +++ b/module-client/src/test/java/org/apache/http/localserver/RandomHandler.java @@ -51,8 +51,6 @@ import org.apache.http.protocol.HttpRequestHandler; /** * A handler that generates random data. * - * @author Roland Weber - * @author Oleg Kalnichevski * * * diff --git a/module-client/src/test/java/org/apache/http/mockup/HttpConnectionMockup.java b/module-client/src/test/java/org/apache/http/mockup/HttpConnectionMockup.java index a6c2771c4..3f36606cb 100644 --- a/module-client/src/test/java/org/apache/http/mockup/HttpConnectionMockup.java +++ b/module-client/src/test/java/org/apache/http/mockup/HttpConnectionMockup.java @@ -38,7 +38,6 @@ import org.apache.http.HttpConnectionMetrics; /** * {@link HttpConnection} mockup implementation. * - * @author Oleg Kalnichevski */ public class HttpConnectionMockup implements HttpConnection { diff --git a/module-httpmime/src/main/java/org/apache/http/entity/mime/FormBodyPart.java b/module-httpmime/src/main/java/org/apache/http/entity/mime/FormBodyPart.java index 7306a9d30..099ef3e75 100644 --- a/module-httpmime/src/main/java/org/apache/http/entity/mime/FormBodyPart.java +++ b/module-httpmime/src/main/java/org/apache/http/entity/mime/FormBodyPart.java @@ -43,7 +43,6 @@ import org.apache.james.mime4j.message.Header; * automatically populates the header with standard fields based * on the content description of the enclosed body. * - * @author Oleg Kalnichevski */ public class FormBodyPart extends BodyPart { diff --git a/module-httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java b/module-httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java index 98780f1db..315690ef4 100644 --- a/module-httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java +++ b/module-httpmime/src/main/java/org/apache/http/entity/mime/HttpMultipart.java @@ -56,7 +56,6 @@ import org.apache.james.mime4j.util.MessageUtils; * capable of operating either in the strict (fully RFC 822, RFC 2045, * RFC 2046 compliant) or the browser compatible modes. * - * @author Oleg Kalnichevski */ public class HttpMultipart extends Multipart { diff --git a/module-httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java b/module-httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java index 3393ec67a..b316be2a8 100644 --- a/module-httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java +++ b/module-httpmime/src/main/java/org/apache/http/entity/mime/MultipartEntity.java @@ -52,7 +52,6 @@ import org.apache.james.mime4j.message.Message; * Multipart/form coded HTTP entity consisting of multiple * body parts. * - * @author Oleg Kalnichevski */ public class MultipartEntity implements HttpEntity { diff --git a/src/site/resources/images/browser.png b/src/site/resources/images/browser.png old mode 100755 new mode 100644 diff --git a/src/site/resources/images/httpclient.png b/src/site/resources/images/httpclient.png old mode 100755 new mode 100644