[httpcomponents-client] 06/10: Update httpcore-ThreadSafe.patch. (GuardedBy)
Markus Koschany
apo at moszumanska.debian.org
Thu Jul 14 21:27:59 UTC 2016
This is an automated email from the git hooks/post-receive script.
apo pushed a commit to branch master
in repository httpcomponents-client.
commit ce8cb923ead91b84bb33e8137d4ca922206da927
Author: Markus Koschany <apo at debian.org>
Date: Thu Jul 14 23:09:08 2016 +0200
Update httpcore-ThreadSafe.patch. (GuardedBy)
---
debian/patches/httpcore-ThreadSafe.patch | 892 ++++++++++++++++++++-----------
1 file changed, 565 insertions(+), 327 deletions(-)
diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
index 54ff969..f08580f 100644
--- a/debian/patches/httpcore-ThreadSafe.patch
+++ b/debian/patches/httpcore-ThreadSafe.patch
@@ -3,311 +3,365 @@ Date: Thu, 14 Jul 2016 23:02:50 +0200
Subject: httpcore ThreadSafe
---
- .../client/fluent/InternalEntityEnclosingHttpRequest.java | 2 --
- .../org/apache/http/client/fluent/InternalHttpRequest.java | 2 --
- .../org/apache/http/impl/client/cache/CachingHttpClient.java | 5 +++--
- .../java/org/apache/http/client/cache/HeaderConstants.java | 5 +++--
- .../java/org/apache/http/client/cache/HttpCacheContext.java | 2 --
- .../java/org/apache/http/client/cache/HttpCacheEntry.java | 5 +++--
- .../main/java/org/apache/http/client/cache/InputLimit.java | 2 --
- .../apache/http/impl/client/cache/BasicHttpCacheStorage.java | 5 +++--
- .../org/apache/http/impl/client/cache/BasicIdGenerator.java | 5 +++--
- .../java/org/apache/http/impl/client/cache/CacheEntity.java | 5 +++--
- .../org/apache/http/impl/client/cache/CacheEntryUpdater.java | 5 +++--
- .../org/apache/http/impl/client/cache/CacheInvalidator.java | 5 +++--
- .../org/apache/http/impl/client/cache/CacheKeyGenerator.java | 5 +++--
- .../apache/http/impl/client/cache/CacheValidityPolicy.java | 5 +++--
- .../apache/http/impl/client/cache/CacheableRequestPolicy.java | 5 +++--
- .../http/impl/client/cache/CachedHttpResponseGenerator.java | 5 +++--
- .../impl/client/cache/CachedResponseSuitabilityChecker.java | 5 +++--
- .../java/org/apache/http/impl/client/cache/CachingExec.java | 5 +++--
- .../org/apache/http/impl/client/cache/CachingHttpClients.java | 5 +++--
- .../org/apache/http/impl/client/cache/CombinedEntity.java | 2 --
- .../http/impl/client/cache/ConditionalRequestBuilder.java | 5 +++--
- .../apache/http/impl/client/cache/DefaultFailureCache.java | 5 +++--
- .../impl/client/cache/DefaultHttpCacheEntrySerializer.java | 5 +++--
- .../client/cache/ExponentialBackOffSchedulingStrategy.java | 5 +++--
- .../org/apache/http/impl/client/cache/FailureCacheValue.java | 5 +++--
- .../java/org/apache/http/impl/client/cache/FileResource.java | 5 +++--
- .../apache/http/impl/client/cache/FileResourceFactory.java | 5 +++--
- .../java/org/apache/http/impl/client/cache/HeapResource.java | 5 +++--
- .../apache/http/impl/client/cache/HeapResourceFactory.java | 5 +++--
- .../main/java/org/apache/http/impl/client/cache/IOUtils.java | 5 +++--
- .../http/impl/client/cache/ImmediateSchedulingStrategy.java | 5 +++--
- .../http/impl/client/cache/ManagedHttpCacheStorage.java | 5 +++--
- .../apache/http/impl/client/cache/OptionsHttp11Response.java | 5 +++--
- .../main/java/org/apache/http/impl/client/cache/Proxies.java | 2 --
- .../http/impl/client/cache/RequestProtocolCompliance.java | 5 +++--
- .../org/apache/http/impl/client/cache/ResourceReference.java | 5 +++--
- .../apache/http/impl/client/cache/ResponseCachingPolicy.java | 5 +++--
- .../http/impl/client/cache/ResponseProtocolCompliance.java | 5 +++--
- .../apache/http/impl/client/cache/ResponseProxyHandler.java | 2 --
- .../http/impl/client/cache/SizeLimitedResponseReader.java | 2 --
- .../apache/http/impl/auth/win/CurrentWindowsCredentials.java | 5 +++--
- .../apache/http/impl/auth/win/WindowsCredentialsProvider.java | 5 +++--
- .../apache/http/impl/auth/win/WindowsNTLMSchemeFactory.java | 5 +++--
- .../org/apache/http/impl/auth/win/WindowsNegotiateScheme.java | 2 --
- .../http/impl/auth/win/WindowsNegotiateSchemeFactory.java | 5 +++--
- .../org/apache/http/auth/params/AuthParams.java | 5 +++--
- .../org/apache/http/client/params/AuthPolicy.java | 5 +++--
- .../org/apache/http/client/params/ClientParamBean.java | 2 --
- .../org/apache/http/client/params/CookiePolicy.java | 5 +++--
- .../org/apache/http/client/params/HttpClientParams.java | 5 +++--
- .../apache/http/client/protocol/ClientContextConfigurer.java | 2 --
- .../http/client/protocol/RequestProxyAuthentication.java | 5 +++--
- .../http/client/protocol/RequestTargetAuthentication.java | 5 +++--
- .../org/apache/http/client/protocol/ResponseAuthCache.java | 5 +++--
- .../java-deprecated/org/apache/http/client/utils/JdkIdn.java | 5 +++--
- .../org/apache/http/client/utils/Punycode.java | 5 +++--
- .../org/apache/http/client/utils/Rfc3492Idn.java | 5 +++--
- .../org/apache/http/conn/BasicEofSensorWatcher.java | 2 --
- .../org/apache/http/conn/BasicManagedEntity.java | 2 --
- .../org/apache/http/conn/MultihomePlainSocketFactory.java | 5 +++--
- .../org/apache/http/conn/params/ConnManagerParamBean.java | 2 --
- .../org/apache/http/conn/params/ConnManagerParams.java | 5 +++--
- .../org/apache/http/conn/params/ConnPerRouteBean.java | 5 +++--
- .../org/apache/http/conn/params/ConnRouteParamBean.java | 2 --
- .../org/apache/http/conn/params/ConnRouteParams.java | 5 +++--
- .../org/apache/http/conn/scheme/PlainSocketFactory.java | 5 +++--
- .../org/apache/http/conn/ssl/SSLContextBuilder.java | 2 --
- .../java-deprecated/org/apache/http/conn/ssl/SSLContexts.java | 5 +++--
- .../org/apache/http/conn/ssl/SSLSocketFactory.java | 5 +++--
- .../org/apache/http/cookie/params/CookieSpecParamBean.java | 2 --
- .../http/impl/client/AbstractAuthenticationHandler.java | 5 +++--
- .../org/apache/http/impl/client/AbstractHttpClient.java | 5 +++--
- .../http/impl/client/AuthenticationStrategyAdaptor.java | 5 +++--
- .../org/apache/http/impl/client/AutoRetryHttpClient.java | 5 +++--
- .../org/apache/http/impl/client/ClientParamsStack.java | 2 --
- .../apache/http/impl/client/CloseableHttpResponseProxy.java | 2 --
- .../apache/http/impl/client/ContentEncodingHttpClient.java | 5 +++--
- .../org/apache/http/impl/client/DefaultHttpClient.java | 5 +++--
- .../http/impl/client/DefaultProxyAuthenticationHandler.java | 5 +++--
- .../org/apache/http/impl/client/DefaultRedirectHandler.java | 5 +++--
- .../http/impl/client/DefaultRedirectStrategyAdaptor.java | 5 +++--
- .../org/apache/http/impl/client/DefaultRequestDirector.java | 2 --
- .../http/impl/client/DefaultTargetAuthenticationHandler.java | 5 +++--
- .../org/apache/http/impl/client/RoutedRequest.java | 5 +----
- .../org/apache/http/impl/client/SystemDefaultHttpClient.java | 5 +++--
- .../org/apache/http/impl/client/TunnelRefusedException.java | 5 +++--
- .../org/apache/http/impl/conn/AbstractClientConnAdapter.java | 2 --
- .../apache/http/impl/conn/BasicClientConnectionManager.java | 5 +++--
- .../org/apache/http/impl/conn/DefaultClientConnection.java | 2 --
- .../http/impl/conn/DefaultClientConnectionOperator.java | 7 ++++---
- .../org/apache/http/impl/conn/DefaultHttpRoutePlanner.java | 7 ++++---
- .../org/apache/http/impl/conn/DefaultResponseParser.java | 5 +++--
- .../org/apache/http/impl/conn/LoggingSessionInputBuffer.java | 5 +++--
- .../org/apache/http/impl/conn/LoggingSessionOutputBuffer.java | 5 +++--
- .../apache/http/impl/conn/ManagedClientConnectionImpl.java | 2 --
- .../apache/http/impl/conn/PoolingClientConnectionManager.java | 5 +++--
- .../org/apache/http/impl/conn/ProxySelectorRoutePlanner.java | 4 +---
- .../org/apache/http/impl/conn/SchemeRegistryFactory.java | 5 +++--
- .../org/apache/http/impl/conn/SingleClientConnManager.java | 5 +++--
- .../org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java | 2 +-
- .../http/impl/conn/tsccm/ThreadSafeClientConnManager.java | 11 ++++++-----
- .../org/apache/http/impl/cookie/BestMatchSpec.java | 5 +++--
- .../org/apache/http/impl/cookie/BestMatchSpecFactory.java | 5 +++--
- .../org/apache/http/impl/cookie/BrowserCompatSpec.java | 5 +++--
- .../org/apache/http/impl/cookie/BrowserCompatSpecFactory.java | 5 +++--
- .../impl/cookie/BrowserCompatVersionAttributeHandler.java | 5 +++--
- .../org/apache/http/impl/cookie/DateParseException.java | 5 +++--
- .../org/apache/http/impl/cookie/DateUtils.java | 5 +++--
- .../org/apache/http/impl/cookie/IgnoreSpecFactory.java | 5 +++--
- .../org/apache/http/impl/cookie/NetscapeDraftSpecFactory.java | 5 +++--
- .../org/apache/http/impl/cookie/PublicSuffixListParser.java | 5 +++--
- .../org/apache/http/impl/cookie/RFC2109SpecFactory.java | 5 +++--
- .../org/apache/http/impl/cookie/RFC2965SpecFactory.java | 5 +++--
- httpclient/src/main/java/org/apache/http/auth/AUTH.java | 5 +++--
- httpclient/src/main/java/org/apache/http/auth/AuthOption.java | 5 +++--
- .../main/java/org/apache/http/auth/AuthSchemeRegistry.java | 5 +++--
- httpclient/src/main/java/org/apache/http/auth/AuthScope.java | 5 +++--
- httpclient/src/main/java/org/apache/http/auth/AuthState.java | 2 --
- .../java/org/apache/http/auth/AuthenticationException.java | 5 +++--
- .../main/java/org/apache/http/auth/BasicUserPrincipal.java | 5 +++--
- .../org/apache/http/auth/InvalidCredentialsException.java | 5 +++--
- .../main/java/org/apache/http/auth/KerberosCredentials.java | 5 +++--
- .../org/apache/http/auth/MalformedChallengeException.java | 5 +++--
- .../src/main/java/org/apache/http/auth/NTCredentials.java | 5 +++--
- .../src/main/java/org/apache/http/auth/NTUserPrincipal.java | 5 +++--
- .../org/apache/http/auth/UsernamePasswordCredentials.java | 5 +++--
- .../org/apache/http/client/CircularRedirectException.java | 5 +++--
- .../java/org/apache/http/client/ClientProtocolException.java | 5 +++--
- .../java/org/apache/http/client/HttpResponseException.java | 5 +++--
- .../org/apache/http/client/NonRepeatableRequestException.java | 5 +++--
- .../main/java/org/apache/http/client/RedirectException.java | 5 +++--
- .../main/java/org/apache/http/client/config/AuthSchemes.java | 5 +++--
- .../main/java/org/apache/http/client/config/CookieSpecs.java | 5 +++--
- .../java/org/apache/http/client/config/RequestConfig.java | 5 +++--
- .../java/org/apache/http/client/entity/EntityBuilder.java | 2 --
- .../http/client/entity/LazyDecompressingInputStream.java | 2 --
- .../org/apache/http/client/entity/UrlEncodedFormEntity.java | 2 --
- .../main/java/org/apache/http/client/methods/HttpDelete.java | 2 --
- .../http/client/methods/HttpEntityEnclosingRequestBase.java | 2 --
- .../src/main/java/org/apache/http/client/methods/HttpGet.java | 2 --
- .../main/java/org/apache/http/client/methods/HttpHead.java | 2 --
- .../main/java/org/apache/http/client/methods/HttpOptions.java | 2 --
- .../main/java/org/apache/http/client/methods/HttpPatch.java | 2 --
- .../main/java/org/apache/http/client/methods/HttpPost.java | 2 --
- .../src/main/java/org/apache/http/client/methods/HttpPut.java | 2 --
- .../java/org/apache/http/client/methods/HttpRequestBase.java | 2 --
- .../org/apache/http/client/methods/HttpRequestWrapper.java | 2 --
- .../main/java/org/apache/http/client/methods/HttpTrace.java | 2 --
- .../java/org/apache/http/client/methods/RequestBuilder.java | 2 --
- .../org/apache/http/client/protocol/HttpClientContext.java | 2 --
- .../apache/http/client/protocol/RequestAcceptEncoding.java | 5 +++--
- .../org/apache/http/client/protocol/RequestAddCookies.java | 5 +++--
- .../org/apache/http/client/protocol/RequestAuthCache.java | 5 +++--
- .../apache/http/client/protocol/RequestClientConnControl.java | 5 +++--
- .../apache/http/client/protocol/RequestDefaultHeaders.java | 5 +++--
- .../apache/http/client/protocol/RequestExpectContinue.java | 5 +++--
- .../apache/http/client/protocol/ResponseContentEncoding.java | 5 +++--
- .../apache/http/client/protocol/ResponseProcessCookies.java | 5 +++--
- .../main/java/org/apache/http/client/utils/CloneUtils.java | 5 +++--
- .../src/main/java/org/apache/http/client/utils/DateUtils.java | 5 +++--
- .../main/java/org/apache/http/client/utils/URIBuilder.java | 2 --
- .../src/main/java/org/apache/http/client/utils/URIUtils.java | 5 +++--
- .../java/org/apache/http/client/utils/URLEncodedUtils.java | 5 +++--
- .../java/org/apache/http/conn/ConnectTimeoutException.java | 5 +++--
- .../org/apache/http/conn/ConnectionPoolTimeoutException.java | 5 +++--
- .../main/java/org/apache/http/conn/EofSensorInputStream.java | 2 --
- .../java/org/apache/http/conn/HttpHostConnectException.java | 5 +++--
- .../java/org/apache/http/conn/UnsupportedSchemeException.java | 5 +++--
- .../java/org/apache/http/conn/routing/BasicRouteDirector.java | 5 +++--
- .../src/main/java/org/apache/http/conn/routing/HttpRoute.java | 5 +++--
- .../main/java/org/apache/http/conn/routing/RouteTracker.java | 2 --
- .../src/main/java/org/apache/http/conn/scheme/Scheme.java | 5 +++--
- .../main/java/org/apache/http/conn/scheme/SchemeRegistry.java | 5 +++--
- .../apache/http/conn/socket/PlainConnectionSocketFactory.java | 5 +++--
- .../org/apache/http/conn/ssl/AllowAllHostnameVerifier.java | 5 +++--
- .../apache/http/conn/ssl/BrowserCompatHostnameVerifier.java | 5 +++--
- .../org/apache/http/conn/ssl/DefaultHostnameVerifier.java | 5 +++--
- .../java/org/apache/http/conn/ssl/NoopHostnameVerifier.java | 5 +++--
- .../org/apache/http/conn/ssl/SSLConnectionSocketFactory.java | 5 +++--
- .../java/org/apache/http/conn/ssl/StrictHostnameVerifier.java | 5 +++--
- .../main/java/org/apache/http/conn/util/InetAddressUtils.java | 5 +++--
- .../main/java/org/apache/http/conn/util/PublicSuffixList.java | 5 +++--
- .../org/apache/http/conn/util/PublicSuffixListParser.java | 5 +++--
- .../java/org/apache/http/conn/util/PublicSuffixMatcher.java | 5 +++--
- .../org/apache/http/conn/util/PublicSuffixMatcherLoader.java | 5 +++--
- .../java/org/apache/http/cookie/CookieIdentityComparator.java | 5 +++--
- .../src/main/java/org/apache/http/cookie/CookieOrigin.java | 5 +++--
- .../java/org/apache/http/cookie/CookiePathComparator.java | 5 +++--
- .../java/org/apache/http/cookie/CookiePriorityComparator.java | 5 +++--
- .../http/cookie/CookieRestrictionViolationException.java | 5 +++--
- .../main/java/org/apache/http/cookie/CookieSpecRegistry.java | 5 +++--
- .../java/org/apache/http/cookie/MalformedCookieException.java | 5 +++--
- .../main/java/org/apache/http/impl/auth/AuthSchemeBase.java | 2 --
- .../src/main/java/org/apache/http/impl/auth/BasicScheme.java | 2 --
- .../java/org/apache/http/impl/auth/BasicSchemeFactory.java | 5 +++--
- .../src/main/java/org/apache/http/impl/auth/DigestScheme.java | 2 --
- .../java/org/apache/http/impl/auth/DigestSchemeFactory.java | 5 +++--
- .../main/java/org/apache/http/impl/auth/GGSSchemeBase.java | 2 --
- .../main/java/org/apache/http/impl/auth/KerberosScheme.java | 2 --
- .../java/org/apache/http/impl/auth/KerberosSchemeFactory.java | 5 +++--
- .../java/org/apache/http/impl/auth/NTLMEngineException.java | 5 +++--
- .../main/java/org/apache/http/impl/auth/NTLMEngineImpl.java | 2 --
- .../src/main/java/org/apache/http/impl/auth/NTLMScheme.java | 2 --
- .../java/org/apache/http/impl/auth/NTLMSchemeFactory.java | 5 +++--
- .../main/java/org/apache/http/impl/auth/RFC2617Scheme.java | 2 --
- .../src/main/java/org/apache/http/impl/auth/SPNegoScheme.java | 2 --
- .../java/org/apache/http/impl/auth/SPNegoSchemeFactory.java | 5 +++--
- .../http/impl/auth/UnsupportedDigestAlgorithmException.java | 5 +++--
- .../org/apache/http/impl/client/AbstractResponseHandler.java | 5 +++--
- .../apache/http/impl/client/AuthenticationStrategyImpl.java | 5 +++--
- .../main/java/org/apache/http/impl/client/BasicAuthCache.java | 5 +++--
- .../java/org/apache/http/impl/client/BasicCookieStore.java | 5 +++--
- .../org/apache/http/impl/client/BasicCredentialsProvider.java | 5 +++--
- .../org/apache/http/impl/client/BasicResponseHandler.java | 5 +++--
- .../java/org/apache/http/impl/client/CloseableHttpClient.java | 5 +++--
- .../http/impl/client/DefaultConnectionKeepAliveStrategy.java | 5 +++--
- .../http/impl/client/DefaultHttpRequestRetryHandler.java | 5 +++--
- .../org/apache/http/impl/client/DefaultRedirectStrategy.java | 5 +++--
- .../impl/client/DefaultServiceUnavailableRetryStrategy.java | 5 +++--
- .../org/apache/http/impl/client/DefaultUserTokenHandler.java | 5 +++--
- .../http/impl/client/EntityEnclosingRequestWrapper.java | 2 --
- .../http/impl/client/FutureRequestExecutionService.java | 5 +++--
- .../java/org/apache/http/impl/client/HttpClientBuilder.java | 2 --
- .../main/java/org/apache/http/impl/client/HttpClients.java | 5 +++--
- .../java/org/apache/http/impl/client/InternalHttpClient.java | 5 +++--
- .../java/org/apache/http/impl/client/LaxRedirectStrategy.java | 5 +++--
- .../java/org/apache/http/impl/client/MinimalHttpClient.java | 5 +++--
- .../org/apache/http/impl/client/NoopUserTokenHandler.java | 5 +++--
- .../apache/http/impl/client/ProxyAuthenticationStrategy.java | 5 +++--
- .../java/org/apache/http/impl/client/RedirectLocations.java | 2 --
- .../main/java/org/apache/http/impl/client/RequestWrapper.java | 2 --
- .../http/impl/client/StandardHttpRequestRetryHandler.java | 5 +++--
- .../http/impl/client/SystemDefaultCredentialsProvider.java | 5 +++--
- .../apache/http/impl/client/TargetAuthenticationStrategy.java | 5 +++--
- .../http/impl/conn/BasicHttpClientConnectionManager.java | 5 +++--
- httpclient/src/main/java/org/apache/http/impl/conn/CPool.java | 5 +++--
- .../src/main/java/org/apache/http/impl/conn/CPoolEntry.java | 5 +++--
- .../src/main/java/org/apache/http/impl/conn/CPoolProxy.java | 2 --
- .../apache/http/impl/conn/ConnectionShutdownException.java | 5 +++--
- .../http/impl/conn/DefaultHttpClientConnectionOperator.java | 5 +++--
- .../org/apache/http/impl/conn/DefaultHttpResponseParser.java | 2 --
- .../http/impl/conn/DefaultHttpResponseParserFactory.java | 5 +++--
- .../http/impl/conn/DefaultManagedHttpClientConnection.java | 2 --
- .../org/apache/http/impl/conn/DefaultProxyRoutePlanner.java | 5 +++--
- .../java/org/apache/http/impl/conn/DefaultRoutePlanner.java | 5 +++--
- .../org/apache/http/impl/conn/DefaultSchemePortResolver.java | 5 +++--
- .../java/org/apache/http/impl/conn/LoggingInputStream.java | 2 --
- .../http/impl/conn/LoggingManagedHttpClientConnection.java | 2 --
- .../java/org/apache/http/impl/conn/LoggingOutputStream.java | 2 --
- .../http/impl/conn/ManagedHttpClientConnectionFactory.java | 5 +++--
- .../http/impl/conn/PoolingHttpClientConnectionManager.java | 5 +++--
- .../org/apache/http/impl/conn/SystemDefaultRoutePlanner.java | 5 +++--
- httpclient/src/main/java/org/apache/http/impl/conn/Wire.java | 5 +++--
- .../http/impl/cookie/AbstractCookieAttributeHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/AbstractCookieSpec.java | 5 +++--
- .../java/org/apache/http/impl/cookie/BasicClientCookie.java | 2 --
- .../java/org/apache/http/impl/cookie/BasicClientCookie2.java | 2 --
- .../java/org/apache/http/impl/cookie/BasicCommentHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/BasicDomainHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/BasicExpiresHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/BasicMaxAgeHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/BasicPathHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/BasicSecureHandler.java | 5 +++--
- .../main/java/org/apache/http/impl/cookie/CookieSpecBase.java | 5 +++--
- .../java/org/apache/http/impl/cookie/DefaultCookieSpec.java | 5 +++--
- .../apache/http/impl/cookie/DefaultCookieSpecProvider.java | 5 +++--
- .../src/main/java/org/apache/http/impl/cookie/IgnoreSpec.java | 5 +++--
- .../java/org/apache/http/impl/cookie/IgnoreSpecProvider.java | 5 +++--
- .../java/org/apache/http/impl/cookie/LaxExpiresHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/LaxMaxAgeHandler.java | 5 +++--
- .../org/apache/http/impl/cookie/NetscapeDomainHandler.java | 5 +++--
- .../apache/http/impl/cookie/NetscapeDraftHeaderParser.java | 5 +++--
- .../java/org/apache/http/impl/cookie/NetscapeDraftSpec.java | 5 +++--
- .../apache/http/impl/cookie/NetscapeDraftSpecProvider.java | 5 +++--
- .../org/apache/http/impl/cookie/PublicSuffixDomainFilter.java | 5 +++--
- .../org/apache/http/impl/cookie/RFC2109DomainHandler.java | 5 +++--
- .../main/java/org/apache/http/impl/cookie/RFC2109Spec.java | 5 +++--
- .../java/org/apache/http/impl/cookie/RFC2109SpecProvider.java | 5 +++--
- .../org/apache/http/impl/cookie/RFC2109VersionHandler.java | 5 +++--
- .../http/impl/cookie/RFC2965CommentUrlAttributeHandler.java | 5 +++--
- .../http/impl/cookie/RFC2965DiscardAttributeHandler.java | 5 +++--
- .../http/impl/cookie/RFC2965DomainAttributeHandler.java | 5 +++--
- .../apache/http/impl/cookie/RFC2965PortAttributeHandler.java | 5 +++--
- .../main/java/org/apache/http/impl/cookie/RFC2965Spec.java | 5 +++--
- .../java/org/apache/http/impl/cookie/RFC2965SpecProvider.java | 5 +++--
- .../http/impl/cookie/RFC2965VersionAttributeHandler.java | 5 +++--
- .../java/org/apache/http/impl/cookie/RFC6265CookieSpec.java | 5 +++--
- .../apache/http/impl/cookie/RFC6265CookieSpecProvider.java | 5 +++--
- .../main/java/org/apache/http/impl/cookie/RFC6265LaxSpec.java | 5 +++--
- .../java/org/apache/http/impl/cookie/RFC6265StrictSpec.java | 5 +++--
- .../org/apache/http/impl/execchain/BackoffStrategyExec.java | 5 +++--
- .../java/org/apache/http/impl/execchain/ConnectionHolder.java | 5 +++--
- .../org/apache/http/impl/execchain/HttpResponseProxy.java | 2 --
- .../java/org/apache/http/impl/execchain/MainClientExec.java | 5 +++--
- .../org/apache/http/impl/execchain/MinimalClientExec.java | 5 +++--
- .../java/org/apache/http/impl/execchain/ProtocolExec.java | 5 +++--
- .../java/org/apache/http/impl/execchain/RedirectExec.java | 5 +++--
- .../apache/http/impl/execchain/RequestAbortedException.java | 5 +++--
- .../org/apache/http/impl/execchain/RequestEntityProxy.java | 2 --
- .../org/apache/http/impl/execchain/ResponseEntityProxy.java | 2 --
- .../main/java/org/apache/http/impl/execchain/RetryExec.java | 5 +++--
- .../http/impl/execchain/ServiceUnavailableRetryExec.java | 5 +++--
- .../apache/http/impl/execchain/TunnelRefusedException.java | 5 +++--
- 303 files changed, 707 insertions(+), 613 deletions(-)
+ debian/patches/httpcore-ThreadSafe.patch | 6 ------
+ .../fluent/InternalEntityEnclosingHttpRequest.java | 2 --
+ .../http/client/fluent/InternalHttpRequest.java | 2 --
+ .../http/impl/client/cache/CachingHttpClient.java | 5 +++--
+ .../apache/http/client/cache/HeaderConstants.java | 5 +++--
+ .../apache/http/client/cache/HttpCacheContext.java | 2 --
+ .../apache/http/client/cache/HttpCacheEntry.java | 5 +++--
+ .../org/apache/http/client/cache/InputLimit.java | 2 --
+ .../impl/client/cache/BasicHttpCacheStorage.java | 5 +++--
+ .../http/impl/client/cache/BasicIdGenerator.java | 7 +++---
+ .../apache/http/impl/client/cache/CacheEntity.java | 5 +++--
+ .../http/impl/client/cache/CacheEntryUpdater.java | 5 +++--
+ .../http/impl/client/cache/CacheInvalidator.java | 5 +++--
+ .../http/impl/client/cache/CacheKeyGenerator.java | 5 +++--
+ .../impl/client/cache/CacheValidityPolicy.java | 5 +++--
+ .../impl/client/cache/CacheableRequestPolicy.java | 5 +++--
+ .../client/cache/CachedHttpResponseGenerator.java | 5 +++--
+ .../cache/CachedResponseSuitabilityChecker.java | 5 +++--
+ .../apache/http/impl/client/cache/CachingExec.java | 5 +++--
+ .../http/impl/client/cache/CachingHttpClients.java | 5 +++--
+ .../http/impl/client/cache/CombinedEntity.java | 2 --
+ .../client/cache/ConditionalRequestBuilder.java | 5 +++--
+ .../impl/client/cache/DefaultFailureCache.java | 5 +++--
+ .../cache/DefaultHttpCacheEntrySerializer.java | 5 +++--
+ .../ExponentialBackOffSchedulingStrategy.java | 5 +++--
+ .../http/impl/client/cache/FailureCacheValue.java | 5 +++--
+ .../http/impl/client/cache/FileResource.java | 5 +++--
+ .../impl/client/cache/FileResourceFactory.java | 5 +++--
+ .../http/impl/client/cache/HeapResource.java | 5 +++--
+ .../impl/client/cache/HeapResourceFactory.java | 5 +++--
+ .../org/apache/http/impl/client/cache/IOUtils.java | 5 +++--
+ .../client/cache/ImmediateSchedulingStrategy.java | 5 +++--
+ .../impl/client/cache/ManagedHttpCacheStorage.java | 5 +++--
+ .../impl/client/cache/OptionsHttp11Response.java | 5 +++--
+ .../org/apache/http/impl/client/cache/Proxies.java | 2 --
+ .../client/cache/RequestProtocolCompliance.java | 5 +++--
+ .../http/impl/client/cache/ResourceReference.java | 5 +++--
+ .../impl/client/cache/ResponseCachingPolicy.java | 5 +++--
+ .../client/cache/ResponseProtocolCompliance.java | 5 +++--
+ .../impl/client/cache/ResponseProxyHandler.java | 2 --
+ .../client/cache/SizeLimitedResponseReader.java | 2 --
+ .../impl/auth/win/CurrentWindowsCredentials.java | 5 +++--
+ .../impl/auth/win/WindowsCredentialsProvider.java | 5 +++--
+ .../impl/auth/win/WindowsNTLMSchemeFactory.java | 5 +++--
+ .../http/impl/auth/win/WindowsNegotiateScheme.java | 2 --
+ .../auth/win/WindowsNegotiateSchemeFactory.java | 5 +++--
+ .../org/apache/http/auth/params/AuthParams.java | 5 +++--
+ .../org/apache/http/client/params/AuthPolicy.java | 5 +++--
+ .../apache/http/client/params/ClientParamBean.java | 2 --
+ .../apache/http/client/params/CookiePolicy.java | 5 +++--
+ .../http/client/params/HttpClientParams.java | 5 +++--
+ .../client/protocol/ClientContextConfigurer.java | 2 --
+ .../protocol/RequestProxyAuthentication.java | 5 +++--
+ .../protocol/RequestTargetAuthentication.java | 5 +++--
+ .../http/client/protocol/ResponseAuthCache.java | 5 +++--
+ .../org/apache/http/client/utils/JdkIdn.java | 5 +++--
+ .../org/apache/http/client/utils/Punycode.java | 5 +++--
+ .../org/apache/http/client/utils/Rfc3492Idn.java | 5 +++--
+ .../apache/http/conn/BasicEofSensorWatcher.java | 2 --
+ .../org/apache/http/conn/BasicManagedEntity.java | 2 --
+ .../http/conn/MultihomePlainSocketFactory.java | 5 +++--
+ .../http/conn/params/ConnManagerParamBean.java | 2 --
+ .../apache/http/conn/params/ConnManagerParams.java | 5 +++--
+ .../apache/http/conn/params/ConnPerRouteBean.java | 5 +++--
+ .../http/conn/params/ConnRouteParamBean.java | 2 --
+ .../apache/http/conn/params/ConnRouteParams.java | 5 +++--
+ .../http/conn/scheme/PlainSocketFactory.java | 5 +++--
+ .../apache/http/conn/ssl/SSLContextBuilder.java | 2 --
+ .../org/apache/http/conn/ssl/SSLContexts.java | 5 +++--
+ .../org/apache/http/conn/ssl/SSLSocketFactory.java | 5 +++--
+ .../http/cookie/params/CookieSpecParamBean.java | 2 --
+ .../impl/client/AbstractAuthenticationHandler.java | 5 +++--
+ .../http/impl/client/AbstractHttpClient.java | 25 +++-------------------
+ .../impl/client/AuthenticationStrategyAdaptor.java | 5 +++--
+ .../http/impl/client/AutoRetryHttpClient.java | 5 +++--
+ .../apache/http/impl/client/ClientParamsStack.java | 2 --
+ .../impl/client/CloseableHttpResponseProxy.java | 2 --
+ .../impl/client/ContentEncodingHttpClient.java | 5 +++--
+ .../apache/http/impl/client/DefaultHttpClient.java | 5 +++--
+ .../client/DefaultProxyAuthenticationHandler.java | 5 +++--
+ .../http/impl/client/DefaultRedirectHandler.java | 5 +++--
+ .../client/DefaultRedirectStrategyAdaptor.java | 5 +++--
+ .../http/impl/client/DefaultRequestDirector.java | 2 --
+ .../client/DefaultTargetAuthenticationHandler.java | 5 +++--
+ .../org/apache/http/impl/client/RoutedRequest.java | 5 +----
+ .../http/impl/client/SystemDefaultHttpClient.java | 5 +++--
+ .../http/impl/client/TunnelRefusedException.java | 5 +++--
+ .../http/impl/conn/AbstractClientConnAdapter.java | 2 --
+ .../impl/conn/BasicClientConnectionManager.java | 9 +++-----
+ .../http/impl/conn/DefaultClientConnection.java | 2 --
+ .../impl/conn/DefaultClientConnectionOperator.java | 7 +++---
+ .../http/impl/conn/DefaultHttpRoutePlanner.java | 7 +++---
+ .../http/impl/conn/DefaultResponseParser.java | 5 +++--
+ .../http/impl/conn/LoggingSessionInputBuffer.java | 5 +++--
+ .../http/impl/conn/LoggingSessionOutputBuffer.java | 5 +++--
+ .../impl/conn/ManagedClientConnectionImpl.java | 2 --
+ .../impl/conn/PoolingClientConnectionManager.java | 5 +++--
+ .../http/impl/conn/ProxySelectorRoutePlanner.java | 4 +---
+ .../http/impl/conn/SchemeRegistryFactory.java | 5 +++--
+ .../http/impl/conn/SingleClientConnManager.java | 10 +++------
+ .../http/impl/conn/tsccm/AbstractConnPool.java | 3 ---
+ .../http/impl/conn/tsccm/BasicPoolEntryRef.java | 2 +-
+ .../conn/tsccm/ThreadSafeClientConnManager.java | 11 +++++-----
+ .../org/apache/http/impl/cookie/BestMatchSpec.java | 5 +++--
+ .../http/impl/cookie/BestMatchSpecFactory.java | 5 +++--
+ .../apache/http/impl/cookie/BrowserCompatSpec.java | 5 +++--
+ .../http/impl/cookie/BrowserCompatSpecFactory.java | 5 +++--
+ .../BrowserCompatVersionAttributeHandler.java | 5 +++--
+ .../http/impl/cookie/DateParseException.java | 5 +++--
+ .../org/apache/http/impl/cookie/DateUtils.java | 5 +++--
+ .../apache/http/impl/cookie/IgnoreSpecFactory.java | 5 +++--
+ .../http/impl/cookie/NetscapeDraftSpecFactory.java | 5 +++--
+ .../http/impl/cookie/PublicSuffixListParser.java | 5 +++--
+ .../http/impl/cookie/RFC2109SpecFactory.java | 5 +++--
+ .../http/impl/cookie/RFC2965SpecFactory.java | 5 +++--
+ .../src/main/java/org/apache/http/auth/AUTH.java | 5 +++--
+ .../main/java/org/apache/http/auth/AuthOption.java | 5 +++--
+ .../org/apache/http/auth/AuthSchemeRegistry.java | 5 +++--
+ .../main/java/org/apache/http/auth/AuthScope.java | 5 +++--
+ .../main/java/org/apache/http/auth/AuthState.java | 2 --
+ .../apache/http/auth/AuthenticationException.java | 5 +++--
+ .../org/apache/http/auth/BasicUserPrincipal.java | 5 +++--
+ .../http/auth/InvalidCredentialsException.java | 5 +++--
+ .../org/apache/http/auth/KerberosCredentials.java | 5 +++--
+ .../http/auth/MalformedChallengeException.java | 5 +++--
+ .../java/org/apache/http/auth/NTCredentials.java | 5 +++--
+ .../java/org/apache/http/auth/NTUserPrincipal.java | 5 +++--
+ .../http/auth/UsernamePasswordCredentials.java | 5 +++--
+ .../http/client/CircularRedirectException.java | 5 +++--
+ .../http/client/ClientProtocolException.java | 5 +++--
+ .../apache/http/client/HttpResponseException.java | 5 +++--
+ .../http/client/NonRepeatableRequestException.java | 5 +++--
+ .../org/apache/http/client/RedirectException.java | 5 +++--
+ .../org/apache/http/client/config/AuthSchemes.java | 5 +++--
+ .../org/apache/http/client/config/CookieSpecs.java | 5 +++--
+ .../apache/http/client/config/RequestConfig.java | 5 +++--
+ .../apache/http/client/entity/EntityBuilder.java | 2 --
+ .../entity/LazyDecompressingInputStream.java | 2 --
+ .../http/client/entity/UrlEncodedFormEntity.java | 2 --
+ .../org/apache/http/client/methods/HttpDelete.java | 2 --
+ .../methods/HttpEntityEnclosingRequestBase.java | 2 --
+ .../org/apache/http/client/methods/HttpGet.java | 2 --
+ .../org/apache/http/client/methods/HttpHead.java | 2 --
+ .../apache/http/client/methods/HttpOptions.java | 2 --
+ .../org/apache/http/client/methods/HttpPatch.java | 2 --
+ .../org/apache/http/client/methods/HttpPost.java | 2 --
+ .../org/apache/http/client/methods/HttpPut.java | 2 --
+ .../http/client/methods/HttpRequestBase.java | 2 --
+ .../http/client/methods/HttpRequestWrapper.java | 2 --
+ .../org/apache/http/client/methods/HttpTrace.java | 2 --
+ .../apache/http/client/methods/RequestBuilder.java | 2 --
+ .../http/client/protocol/HttpClientContext.java | 2 --
+ .../client/protocol/RequestAcceptEncoding.java | 5 +++--
+ .../http/client/protocol/RequestAddCookies.java | 5 +++--
+ .../http/client/protocol/RequestAuthCache.java | 5 +++--
+ .../client/protocol/RequestClientConnControl.java | 5 +++--
+ .../client/protocol/RequestDefaultHeaders.java | 5 +++--
+ .../client/protocol/RequestExpectContinue.java | 5 +++--
+ .../client/protocol/ResponseContentEncoding.java | 5 +++--
+ .../client/protocol/ResponseProcessCookies.java | 5 +++--
+ .../org/apache/http/client/utils/CloneUtils.java | 5 +++--
+ .../org/apache/http/client/utils/DateUtils.java | 5 +++--
+ .../org/apache/http/client/utils/URIBuilder.java | 2 --
+ .../org/apache/http/client/utils/URIUtils.java | 5 +++--
+ .../apache/http/client/utils/URLEncodedUtils.java | 5 +++--
+ .../apache/http/conn/ConnectTimeoutException.java | 5 +++--
+ .../http/conn/ConnectionPoolTimeoutException.java | 5 +++--
+ .../org/apache/http/conn/EofSensorInputStream.java | 2 --
+ .../apache/http/conn/HttpHostConnectException.java | 5 +++--
+ .../http/conn/UnsupportedSchemeException.java | 5 +++--
+ .../http/conn/routing/BasicRouteDirector.java | 5 +++--
+ .../org/apache/http/conn/routing/HttpRoute.java | 5 +++--
+ .../org/apache/http/conn/routing/RouteTracker.java | 2 --
+ .../java/org/apache/http/conn/scheme/Scheme.java | 5 +++--
+ .../apache/http/conn/scheme/SchemeRegistry.java | 5 +++--
+ .../conn/socket/PlainConnectionSocketFactory.java | 5 +++--
+ .../http/conn/ssl/AllowAllHostnameVerifier.java | 5 +++--
+ .../conn/ssl/BrowserCompatHostnameVerifier.java | 5 +++--
+ .../http/conn/ssl/DefaultHostnameVerifier.java | 5 +++--
+ .../apache/http/conn/ssl/NoopHostnameVerifier.java | 5 +++--
+ .../http/conn/ssl/SSLConnectionSocketFactory.java | 5 +++--
+ .../http/conn/ssl/StrictHostnameVerifier.java | 5 +++--
+ .../apache/http/conn/util/InetAddressUtils.java | 5 +++--
+ .../apache/http/conn/util/PublicSuffixList.java | 5 +++--
+ .../http/conn/util/PublicSuffixListParser.java | 5 +++--
+ .../apache/http/conn/util/PublicSuffixMatcher.java | 5 +++--
+ .../http/conn/util/PublicSuffixMatcherLoader.java | 5 +++--
+ .../http/cookie/CookieIdentityComparator.java | 5 +++--
+ .../java/org/apache/http/cookie/CookieOrigin.java | 5 +++--
+ .../apache/http/cookie/CookiePathComparator.java | 5 +++--
+ .../http/cookie/CookiePriorityComparator.java | 5 +++--
+ .../CookieRestrictionViolationException.java | 5 +++--
+ .../org/apache/http/cookie/CookieSpecRegistry.java | 5 +++--
+ .../http/cookie/MalformedCookieException.java | 5 +++--
+ .../org/apache/http/impl/auth/AuthSchemeBase.java | 2 --
+ .../org/apache/http/impl/auth/BasicScheme.java | 2 --
+ .../apache/http/impl/auth/BasicSchemeFactory.java | 5 +++--
+ .../org/apache/http/impl/auth/DigestScheme.java | 2 --
+ .../apache/http/impl/auth/DigestSchemeFactory.java | 5 +++--
+ .../org/apache/http/impl/auth/GGSSchemeBase.java | 2 --
+ .../org/apache/http/impl/auth/KerberosScheme.java | 2 --
+ .../http/impl/auth/KerberosSchemeFactory.java | 5 +++--
+ .../apache/http/impl/auth/NTLMEngineException.java | 5 +++--
+ .../org/apache/http/impl/auth/NTLMEngineImpl.java | 2 --
+ .../java/org/apache/http/impl/auth/NTLMScheme.java | 2 --
+ .../apache/http/impl/auth/NTLMSchemeFactory.java | 5 +++--
+ .../org/apache/http/impl/auth/RFC2617Scheme.java | 2 --
+ .../org/apache/http/impl/auth/SPNegoScheme.java | 2 --
+ .../apache/http/impl/auth/SPNegoSchemeFactory.java | 5 +++--
+ .../auth/UnsupportedDigestAlgorithmException.java | 5 +++--
+ .../http/impl/client/AbstractResponseHandler.java | 5 +++--
+ .../impl/client/AuthenticationStrategyImpl.java | 5 +++--
+ .../apache/http/impl/client/BasicAuthCache.java | 5 +++--
+ .../apache/http/impl/client/BasicCookieStore.java | 7 +++---
+ .../http/impl/client/BasicCredentialsProvider.java | 5 +++--
+ .../http/impl/client/BasicResponseHandler.java | 5 +++--
+ .../http/impl/client/CloseableHttpClient.java | 5 +++--
+ .../client/DefaultConnectionKeepAliveStrategy.java | 5 +++--
+ .../client/DefaultHttpRequestRetryHandler.java | 5 +++--
+ .../http/impl/client/DefaultRedirectStrategy.java | 5 +++--
+ .../DefaultServiceUnavailableRetryStrategy.java | 5 +++--
+ .../http/impl/client/DefaultUserTokenHandler.java | 5 +++--
+ .../impl/client/EntityEnclosingRequestWrapper.java | 2 --
+ .../impl/client/FutureRequestExecutionService.java | 5 +++--
+ .../apache/http/impl/client/HttpClientBuilder.java | 2 --
+ .../org/apache/http/impl/client/HttpClients.java | 5 +++--
+ .../http/impl/client/InternalHttpClient.java | 5 +++--
+ .../http/impl/client/LaxRedirectStrategy.java | 5 +++--
+ .../apache/http/impl/client/MinimalHttpClient.java | 5 +++--
+ .../http/impl/client/NoopUserTokenHandler.java | 5 +++--
+ .../impl/client/ProxyAuthenticationStrategy.java | 5 +++--
+ .../apache/http/impl/client/RedirectLocations.java | 2 --
+ .../apache/http/impl/client/RequestWrapper.java | 2 --
+ .../client/StandardHttpRequestRetryHandler.java | 5 +++--
+ .../client/SystemDefaultCredentialsProvider.java | 5 +++--
+ .../impl/client/TargetAuthenticationStrategy.java | 5 +++--
+ .../conn/BasicHttpClientConnectionManager.java | 14 +++---------
+ .../main/java/org/apache/http/impl/conn/CPool.java | 5 +++--
+ .../java/org/apache/http/impl/conn/CPoolEntry.java | 5 +++--
+ .../java/org/apache/http/impl/conn/CPoolProxy.java | 2 --
+ .../impl/conn/ConnectionShutdownException.java | 5 +++--
+ .../conn/DefaultHttpClientConnectionOperator.java | 5 +++--
+ .../http/impl/conn/DefaultHttpResponseParser.java | 2 --
+ .../conn/DefaultHttpResponseParserFactory.java | 5 +++--
+ .../conn/DefaultManagedHttpClientConnection.java | 2 --
+ .../http/impl/conn/DefaultProxyRoutePlanner.java | 5 +++--
+ .../apache/http/impl/conn/DefaultRoutePlanner.java | 5 +++--
+ .../http/impl/conn/DefaultSchemePortResolver.java | 5 +++--
+ .../apache/http/impl/conn/LoggingInputStream.java | 2 --
+ .../conn/LoggingManagedHttpClientConnection.java | 2 --
+ .../apache/http/impl/conn/LoggingOutputStream.java | 2 --
+ .../conn/ManagedHttpClientConnectionFactory.java | 5 +++--
+ .../conn/PoolingHttpClientConnectionManager.java | 5 +++--
+ .../http/impl/conn/SystemDefaultRoutePlanner.java | 5 +++--
+ .../main/java/org/apache/http/impl/conn/Wire.java | 5 +++--
+ .../cookie/AbstractCookieAttributeHandler.java | 5 +++--
+ .../http/impl/cookie/AbstractCookieSpec.java | 5 +++--
+ .../apache/http/impl/cookie/BasicClientCookie.java | 2 --
+ .../http/impl/cookie/BasicClientCookie2.java | 2 --
+ .../http/impl/cookie/BasicCommentHandler.java | 5 +++--
+ .../http/impl/cookie/BasicDomainHandler.java | 5 +++--
+ .../http/impl/cookie/BasicExpiresHandler.java | 5 +++--
+ .../http/impl/cookie/BasicMaxAgeHandler.java | 5 +++--
+ .../apache/http/impl/cookie/BasicPathHandler.java | 5 +++--
+ .../http/impl/cookie/BasicSecureHandler.java | 5 +++--
+ .../apache/http/impl/cookie/CookieSpecBase.java | 5 +++--
+ .../apache/http/impl/cookie/DefaultCookieSpec.java | 5 +++--
+ .../impl/cookie/DefaultCookieSpecProvider.java | 5 +++--
+ .../org/apache/http/impl/cookie/IgnoreSpec.java | 5 +++--
+ .../http/impl/cookie/IgnoreSpecProvider.java | 5 +++--
+ .../apache/http/impl/cookie/LaxExpiresHandler.java | 5 +++--
+ .../apache/http/impl/cookie/LaxMaxAgeHandler.java | 5 +++--
+ .../http/impl/cookie/NetscapeDomainHandler.java | 5 +++--
+ .../impl/cookie/NetscapeDraftHeaderParser.java | 5 +++--
+ .../apache/http/impl/cookie/NetscapeDraftSpec.java | 5 +++--
+ .../impl/cookie/NetscapeDraftSpecProvider.java | 5 +++--
+ .../http/impl/cookie/PublicSuffixDomainFilter.java | 5 +++--
+ .../http/impl/cookie/RFC2109DomainHandler.java | 5 +++--
+ .../org/apache/http/impl/cookie/RFC2109Spec.java | 5 +++--
+ .../http/impl/cookie/RFC2109SpecProvider.java | 5 +++--
+ .../http/impl/cookie/RFC2109VersionHandler.java | 5 +++--
+ .../cookie/RFC2965CommentUrlAttributeHandler.java | 5 +++--
+ .../cookie/RFC2965DiscardAttributeHandler.java | 5 +++--
+ .../impl/cookie/RFC2965DomainAttributeHandler.java | 5 +++--
+ .../impl/cookie/RFC2965PortAttributeHandler.java | 5 +++--
+ .../org/apache/http/impl/cookie/RFC2965Spec.java | 5 +++--
+ .../http/impl/cookie/RFC2965SpecProvider.java | 5 +++--
+ .../cookie/RFC2965VersionAttributeHandler.java | 5 +++--
+ .../apache/http/impl/cookie/RFC6265CookieSpec.java | 5 +++--
+ .../impl/cookie/RFC6265CookieSpecProvider.java | 5 +++--
+ .../apache/http/impl/cookie/RFC6265LaxSpec.java | 5 +++--
+ .../apache/http/impl/cookie/RFC6265StrictSpec.java | 5 +++--
+ .../http/impl/execchain/BackoffStrategyExec.java | 5 +++--
+ .../http/impl/execchain/ConnectionHolder.java | 5 +++--
+ .../http/impl/execchain/HttpResponseProxy.java | 2 --
+ .../apache/http/impl/execchain/MainClientExec.java | 5 +++--
+ .../http/impl/execchain/MinimalClientExec.java | 5 +++--
+ .../apache/http/impl/execchain/ProtocolExec.java | 5 +++--
+ .../apache/http/impl/execchain/RedirectExec.java | 5 +++--
+ .../impl/execchain/RequestAbortedException.java | 5 +++--
+ .../http/impl/execchain/RequestEntityProxy.java | 2 --
+ .../http/impl/execchain/ResponseEntityProxy.java | 2 --
+ .../org/apache/http/impl/execchain/RetryExec.java | 5 +++--
+ .../execchain/ServiceUnavailableRetryExec.java | 5 +++--
+ .../impl/execchain/TunnelRefusedException.java | 5 +++--
+ 305 files changed, 707 insertions(+), 664 deletions(-)
+diff --git a/debian/patches/httpcore-ThreadSafe.patch b/debian/patches/httpcore-ThreadSafe.patch
+index 54ff969..982a5c7 100644
+--- a/debian/patches/httpcore-ThreadSafe.patch
++++ b/debian/patches/httpcore-ThreadSafe.patch
+@@ -480,7 +480,6 @@ index 04236ab..e39f110 100644
+ @@ -34,12 +34,13 @@ import java.util.Formatter;
+ import java.util.Locale;
+
+- import org.apache.http.annotation.GuardedBy;
+ -import org.apache.http.annotation.ThreadSafe;
+ +import org.apache.http.annotation.ThreadingBehavior;
+ +import org.apache.http.annotation.Contract;
+@@ -1871,7 +1870,6 @@ index 18a42d7..307dd7d 100644
+ @@ -39,7 +39,8 @@ import org.apache.http.HttpRequest;
+ import org.apache.http.HttpRequestInterceptor;
+ import org.apache.http.HttpResponseInterceptor;
+- import org.apache.http.annotation.GuardedBy;
+ -import org.apache.http.annotation.ThreadSafe;
+ +import org.apache.http.annotation.ThreadingBehavior;
+ +import org.apache.http.annotation.Contract;
+@@ -2229,7 +2227,6 @@ index 9e424a4..fd625d3 100644
+ @@ -35,7 +35,8 @@ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+ import org.apache.http.HttpClientConnection;
+- import org.apache.http.annotation.GuardedBy;
+ -import org.apache.http.annotation.ThreadSafe;
+ +import org.apache.http.annotation.ThreadingBehavior;
+ +import org.apache.http.annotation.Contract;
+@@ -2492,7 +2489,6 @@ index 774cf4a..a8adcb3 100644
+ @@ -33,7 +33,8 @@ import java.util.concurrent.TimeUnit;
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+- import org.apache.http.annotation.GuardedBy;
+ -import org.apache.http.annotation.ThreadSafe;
+ +import org.apache.http.annotation.ThreadingBehavior;
+ +import org.apache.http.annotation.Contract;
+@@ -5007,7 +5003,6 @@ index 52b76b1..8430a6e 100644
+ @@ -34,7 +34,8 @@ import java.util.List;
+ import java.util.TreeSet;
+
+- import org.apache.http.annotation.GuardedBy;
+ -import org.apache.http.annotation.ThreadSafe;
+ +import org.apache.http.annotation.ThreadingBehavior;
+ +import org.apache.http.annotation.Contract;
+@@ -5524,7 +5519,6 @@ index 92ca644..e737315 100644
+ @@ -39,7 +39,8 @@ import org.apache.commons.logging.LogFactory;
+ import org.apache.http.HttpClientConnection;
+ import org.apache.http.HttpHost;
+- import org.apache.http.annotation.GuardedBy;
+ -import org.apache.http.annotation.ThreadSafe;
+ +import org.apache.http.annotation.ThreadingBehavior;
+ +import org.apache.http.annotation.Contract;
diff --git a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java b/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
index 6e0b4d6..a7972b8 100644
--- a/fluent-hc/src/main/java/org/apache/http/client/fluent/InternalEntityEnclosingHttpRequest.java
@@ -474,13 +528,14 @@ index 76a525c..74109a4 100644
private final CacheMap entries;
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java
-index 04236ab..e39f110 100644
+index 04236ab..0f3001e 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java
+++ b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/BasicIdGenerator.java
-@@ -34,12 +34,13 @@ import java.util.Formatter;
+@@ -33,19 +33,18 @@ import java.security.SecureRandom;
+ import java.util.Formatter;
import java.util.Locale;
- import org.apache.http.annotation.GuardedBy;
+-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.annotation.Contract;
@@ -493,6 +548,12 @@ index 04236ab..e39f110 100644
class BasicIdGenerator {
private final String hostname;
+ private final SecureRandom rnd;
+
+- @GuardedBy("this")
+ private long count;
+
+ public BasicIdGenerator() {
diff --git a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java b/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
index 66e4af7..42a99e4 100644
--- a/httpclient-cache/src/main/java/org/apache/http/impl/client/cache/CacheEntity.java
@@ -1865,20 +1926,21 @@ index c3af00d..eb7e10b 100644
private final Log log = LogFactory.getLog(getClass());
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
-index 18a42d7..307dd7d 100644
+index 18a42d7..8613ff2 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
+++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AbstractHttpClient.java
-@@ -39,7 +39,8 @@ import org.apache.http.HttpRequest;
+@@ -38,8 +38,8 @@ import org.apache.http.HttpHost;
+ import org.apache.http.HttpRequest;
import org.apache.http.HttpRequestInterceptor;
import org.apache.http.HttpResponseInterceptor;
- import org.apache.http.annotation.GuardedBy;
+-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.annotation.Contract;
import org.apache.http.auth.AuthSchemeRegistry;
import org.apache.http.client.AuthenticationHandler;
import org.apache.http.client.AuthenticationStrategy;
-@@ -194,7 +195,7 @@ import org.apache.http.util.Args;
+@@ -194,85 +194,66 @@ import org.apache.http.util.Args;
*
* @deprecated (4.3) use {@link HttpClientBuilder}.
*/
@@ -1887,6 +1949,84 @@ index 18a42d7..307dd7d 100644
@Deprecated
public abstract class AbstractHttpClient extends CloseableHttpClient {
+ private final Log log = LogFactory.getLog(getClass());
+
+ /** The parameters. */
+- @GuardedBy("this")
+ private HttpParams defaultParams;
+
+ /** The request executor. */
+- @GuardedBy("this")
+ private HttpRequestExecutor requestExec;
+
+ /** The connection manager. */
+- @GuardedBy("this")
+ private ClientConnectionManager connManager;
+
+ /** The connection re-use strategy. */
+- @GuardedBy("this")
+ private ConnectionReuseStrategy reuseStrategy;
+
+ /** The connection keep-alive strategy. */
+- @GuardedBy("this")
+ private ConnectionKeepAliveStrategy keepAliveStrategy;
+
+ /** The cookie spec registry. */
+- @GuardedBy("this")
+ private CookieSpecRegistry supportedCookieSpecs;
+
+ /** The authentication scheme registry. */
+- @GuardedBy("this")
+ private AuthSchemeRegistry supportedAuthSchemes;
+
+ /** The HTTP protocol processor and its immutable copy. */
+- @GuardedBy("this")
+ private BasicHttpProcessor mutableProcessor;
+
+- @GuardedBy("this")
+ private ImmutableHttpProcessor protocolProcessor;
+
+ /** The request retry handler. */
+- @GuardedBy("this")
+ private HttpRequestRetryHandler retryHandler;
+
+ /** The redirect handler. */
+- @GuardedBy("this")
+ private RedirectStrategy redirectStrategy;
+
+ /** The target authentication handler. */
+- @GuardedBy("this")
+ private AuthenticationStrategy targetAuthStrategy;
+
+ /** The proxy authentication handler. */
+- @GuardedBy("this")
+ private AuthenticationStrategy proxyAuthStrategy;
+
+ /** The cookie store. */
+- @GuardedBy("this")
+ private CookieStore cookieStore;
+
+ /** The credentials provider. */
+- @GuardedBy("this")
+ private CredentialsProvider credsProvider;
+
+ /** The route planner. */
+- @GuardedBy("this")
+ private HttpRoutePlanner routePlanner;
+
+ /** The user token handler. */
+- @GuardedBy("this")
+ private UserTokenHandler userTokenHandler;
+
+ /** The connection backoff strategy. */
+- @GuardedBy("this")
+ private ConnectionBackoffStrategy connectionBackoffStrategy;
+
+ /** The backoff manager. */
+- @GuardedBy("this")
+ private BackoffManager backoffManager;
+
+ /**
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
index 2ff4ccf..12abacc 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/client/AuthenticationStrategyAdaptor.java
@@ -2223,20 +2363,21 @@ index 5a1827a..3f2a420 100644
/**
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
-index 9e424a4..fd625d3 100644
+index 9e424a4..1773b2d 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
+++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/BasicClientConnectionManager.java
-@@ -35,7 +35,8 @@ import org.apache.commons.logging.Log;
+@@ -34,8 +34,8 @@ import java.util.concurrent.atomic.AtomicLong;
+ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpClientConnection;
- import org.apache.http.annotation.GuardedBy;
+-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.annotation.Contract;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.ClientConnectionOperator;
import org.apache.http.conn.ClientConnectionRequest;
-@@ -66,7 +67,7 @@ import org.apache.http.util.Asserts;
+@@ -66,7 +66,7 @@ import org.apache.http.util.Asserts;
*
* @deprecated (4.3) use {@link BasicHttpClientConnectionManager}.
*/
@@ -2245,6 +2386,22 @@ index 9e424a4..fd625d3 100644
@Deprecated
public class BasicClientConnectionManager implements ClientConnectionManager {
+@@ -86,15 +86,12 @@ public class BasicClientConnectionManager implements ClientConnectionManager {
+ private final ClientConnectionOperator connOperator;
+
+ /** The one and only entry in this pool. */
+- @GuardedBy("this")
+ private HttpPoolEntry poolEntry;
+
+ /** The currently issued managed connection, if any. */
+- @GuardedBy("this")
+ private ManagedClientConnectionImpl conn;
+
+ /** Indicates whether this connection manager is shut down. */
+- @GuardedBy("this")
+ private volatile boolean shutdown;
+
+ /**
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
index 5a29784..fcd31af 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/DefaultClientConnection.java
@@ -2486,20 +2643,21 @@ index 06105dd..454dbc3 100644
public final class SchemeRegistryFactory {
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
-index 774cf4a..a8adcb3 100644
+index 774cf4a..ca848c2 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
+++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/SingleClientConnManager.java
-@@ -33,7 +33,8 @@ import java.util.concurrent.TimeUnit;
+@@ -32,8 +32,8 @@ import java.util.concurrent.TimeUnit;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
- import org.apache.http.annotation.GuardedBy;
+-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.annotation.Contract;
import org.apache.http.conn.ClientConnectionManager;
import org.apache.http.conn.ClientConnectionOperator;
import org.apache.http.conn.ClientConnectionRequest;
-@@ -61,7 +62,7 @@ import org.apache.http.util.Asserts;
+@@ -61,7 +61,7 @@ import org.apache.http.util.Asserts;
*
* @deprecated (4.2) use {@link BasicClientConnectionManager}
*/
@@ -2508,6 +2666,50 @@ index 774cf4a..a8adcb3 100644
@Deprecated
public class SingleClientConnManager implements ClientConnectionManager {
+@@ -82,19 +82,15 @@ public class SingleClientConnManager implements ClientConnectionManager {
+ protected final boolean alwaysShutDown;
+
+ /** The one and only entry in this pool. */
+- @GuardedBy("this")
+ protected volatile PoolEntry uniquePoolEntry;
+
+ /** The currently issued managed connection, if any. */
+- @GuardedBy("this")
+ protected volatile ConnAdapter managedConn;
+
+ /** The time of the last connection release, or -1. */
+- @GuardedBy("this")
+ protected volatile long lastReleaseTime;
+
+ /** The time the last released connection expires and shouldn't be reused. */
+- @GuardedBy("this")
+ protected volatile long connectionExpiresTime;
+
+ /** Indicates whether this connection manager is shut down. */
+diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
+index c7e6243..83f4c11 100644
+--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
++++ b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/AbstractConnPool.java
+@@ -38,7 +38,6 @@ import java.util.concurrent.locks.ReentrantLock;
+
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
+-import org.apache.http.annotation.GuardedBy;
+ import org.apache.http.conn.ConnectionPoolTimeoutException;
+ import org.apache.http.conn.OperatedClientConnection;
+ import org.apache.http.conn.routing.HttpRoute;
+@@ -67,11 +66,9 @@ public abstract class AbstractConnPool {
+ protected final Lock poolLock;
+
+ /** References to issued connections */
+- @GuardedBy("poolLock")
+ protected Set<BasicPoolEntry> leasedConnections;
+
+ /** The current total number of connections. */
+- @GuardedBy("poolLock")
+ protected int numConnections;
+
+ /** Indicates whether this pool is shut down. */
diff --git a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java b/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
index 2220380..17167ca 100644
--- a/httpclient/src/main/java-deprecated/org/apache/http/impl/conn/tsccm/BasicPoolEntryRef.java
@@ -5001,20 +5203,21 @@ index 97dabb3..0b018b1 100644
private final Log log = LogFactory.getLog(getClass());
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java b/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
-index 52b76b1..8430a6e 100644
+index 52b76b1..8adfd42 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
+++ b/httpclient/src/main/java/org/apache/http/impl/client/BasicCookieStore.java
-@@ -34,7 +34,8 @@ import java.util.List;
+@@ -33,8 +33,8 @@ import java.util.Iterator;
+ import java.util.List;
import java.util.TreeSet;
- import org.apache.http.annotation.GuardedBy;
+-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.annotation.Contract;
import org.apache.http.client.CookieStore;
import org.apache.http.cookie.Cookie;
import org.apache.http.cookie.CookieIdentityComparator;
-@@ -45,7 +46,7 @@ import org.apache.http.cookie.CookieIdentityComparator;
+@@ -45,12 +45,11 @@ import org.apache.http.cookie.CookieIdentityComparator;
*
* @since 4.0
*/
@@ -5023,6 +5226,11 @@ index 52b76b1..8430a6e 100644
public class BasicCookieStore implements CookieStore, Serializable {
private static final long serialVersionUID = -7581093305228232025L;
+
+- @GuardedBy("this")
+ private final TreeSet<Cookie> cookies;
+
+ public BasicCookieStore() {
diff --git a/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java b/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
index 352bbfd..c2f7021 100644
--- a/httpclient/src/main/java/org/apache/http/impl/client/BasicCredentialsProvider.java
@@ -5518,20 +5726,21 @@ index dad2eb7..9fb56e7 100644
public static final TargetAuthenticationStrategy INSTANCE = new TargetAuthenticationStrategy();
diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java b/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
-index 92ca644..e737315 100644
+index 92ca644..56ac7dd 100644
--- a/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
+++ b/httpclient/src/main/java/org/apache/http/impl/conn/BasicHttpClientConnectionManager.java
-@@ -39,7 +39,8 @@ import org.apache.commons.logging.LogFactory;
+@@ -38,8 +38,8 @@ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
import org.apache.http.HttpClientConnection;
import org.apache.http.HttpHost;
- import org.apache.http.annotation.GuardedBy;
+-import org.apache.http.annotation.GuardedBy;
-import org.apache.http.annotation.ThreadSafe;
+import org.apache.http.annotation.ThreadingBehavior;
+import org.apache.http.annotation.Contract;
import org.apache.http.config.ConnectionConfig;
import org.apache.http.config.Lookup;
import org.apache.http.config.Registry;
-@@ -79,7 +80,7 @@ import org.apache.http.util.LangUtils;
+@@ -79,7 +79,7 @@ import org.apache.http.util.LangUtils;
*
* @since 4.3
*/
@@ -5540,6 +5749,35 @@ index 92ca644..e737315 100644
public class BasicHttpClientConnectionManager implements HttpClientConnectionManager, Closeable {
private final Log log = LogFactory.getLog(getClass());
+@@ -87,28 +87,20 @@ public class BasicHttpClientConnectionManager implements HttpClientConnectionMan
+ private final HttpClientConnectionOperator connectionOperator;
+ private final HttpConnectionFactory<HttpRoute, ManagedHttpClientConnection> connFactory;
+
+- @GuardedBy("this")
+ private ManagedHttpClientConnection conn;
+
+- @GuardedBy("this")
+ private HttpRoute route;
+
+- @GuardedBy("this")
+ private Object state;
+
+- @GuardedBy("this")
+ private long updated;
+
+- @GuardedBy("this")
+ private long expiry;
+
+- @GuardedBy("this")
+ private boolean leased;
+
+- @GuardedBy("this")
+ private SocketConfig socketConfig;
+
+- @GuardedBy("this")
+ private ConnectionConfig connConfig;
+
+ private final AtomicBoolean isShutdown;
diff --git a/httpclient/src/main/java/org/apache/http/impl/conn/CPool.java b/httpclient/src/main/java/org/apache/http/impl/conn/CPool.java
index 00238e9..3835af6 100644
--- a/httpclient/src/main/java/org/apache/http/impl/conn/CPool.java
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-client.git
More information about the pkg-java-commits
mailing list