This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository httpcomponents-client.
commit 9c18eeec574f528f836c90e032f474375cee561f Merge: 256366e a071a22 Author: Emmanuel Bourg <[email protected]> Date: Sun Jan 29 20:31:36 2017 +0100 Merge tag 'upstream/4.5.3' Upstream version 4.5.3 NOTICE.txt | 2 +- RELEASE_NOTES.txt | 77 ++ doap_HttpComponents_Client.rdf | 228 +++++ fluent-hc/pom.xml | 2 +- .../fluent/InternalEntityEnclosingHttpRequest.java | 2 - .../http/client/fluent/InternalHttpRequest.java | 2 - .../org/apache/http/client/fluent/Request.java | 2 +- httpclient-cache/pom.xml | 2 +- .../http/impl/client/cache/CachingHttpClient.java | 5 +- .../apache/http/client/cache/HeaderConstants.java | 3 - .../apache/http/client/cache/HttpCacheContext.java | 2 - .../apache/http/client/cache/HttpCacheEntry.java | 5 +- .../org/apache/http/client/cache/InputLimit.java | 3 - .../impl/client/cache/BasicHttpCacheStorage.java | 5 +- .../http/impl/client/cache/BasicIdGenerator.java | 8 +- .../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 | 2 - .../http/impl/client/cache/CombinedEntity.java | 2 - .../client/cache/ConditionalRequestBuilder.java | 5 +- .../impl/client/cache/DefaultFailureCache.java | 7 +- .../cache/DefaultHttpCacheEntrySerializer.java | 5 +- .../ExponentialBackOffSchedulingStrategy.java | 9 +- .../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 | 2 - .../client/cache/ImmediateSchedulingStrategy.java | 9 +- .../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 - httpclient-osgi/pom.xml | 6 +- .../osgi/impl/HttpClientBuilderConfigurator.java | 42 +- .../osgi/impl/HttpProxyConfigurationActivator.java | 97 ++- ...va => OSGiCachingHttpClientBuilderFactory.java} | 45 +- .../http/osgi/impl/OSGiClientBuilderFactory.java | 14 +- .../http/osgi/impl/OSGiCredentialsProvider.java | 64 +- ...lder.java => OSGiHttpClientBuilderFactory.java} | 43 +- .../http/osgi/impl/OSGiHttpRoutePlanner.java | 36 +- .../java/org/apache/http/osgi/impl/WeakList.java | 127 +++ .../services/CachingHttpClientBuilderFactory.java | 23 +- .../main/resources/OSGI-INF/metatype/metatype.xml | 6 +- .../osgi/impl/OSGiCredentialsProviderTest.java | 101 +++ .../http/osgi/impl/TestOSGiHttpRoutePlanner.java | 83 +- .../org/apache/http/osgi/impl/WeakListTest.java} | 67 +- httpclient-win/pom.xml | 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 +- httpclient/pom.xml | 2 +- .../org/apache/http/auth/params/AuthParams.java | 5 +- .../org/apache/http/client/params/AuthPolicy.java | 3 - .../apache/http/client/params/ClientParamBean.java | 2 - .../apache/http/client/params/CookiePolicy.java | 3 - .../http/client/params/HttpClientParams.java | 2 - .../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 | 3 - .../org/apache/http/conn/ssl/SSLContexts.java | 5 +- .../org/apache/http/conn/ssl/SSLSocketFactory.java | 10 +- .../http/cookie/params/CookieSpecParamBean.java | 2 - .../http/impl/auth/SpnegoTokenGenerator.java | 2 +- .../impl/client/AbstractAuthenticationHandler.java | 5 +- .../http/impl/client/AbstractHttpClient.java | 69 +- .../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 | 4 +- .../http/impl/client/SystemDefaultHttpClient.java | 5 +- .../http/impl/client/TunnelRefusedException.java | 2 - .../http/impl/conn/AbstractClientConnAdapter.java | 2 - .../impl/conn/BasicClientConnectionManager.java | 9 +- .../http/impl/conn/DefaultClientConnection.java | 4 +- .../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 | 5 - .../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 | 3 - .../org/apache/http/impl/cookie/DateUtils.java | 3 - .../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 | 3 - .../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 | 2 - .../org/apache/http/auth/BasicUserPrincipal.java | 5 +- .../http/auth/InvalidCredentialsException.java | 3 - .../org/apache/http/auth/KerberosCredentials.java | 5 +- .../http/auth/MalformedChallengeException.java | 2 - .../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 | 3 - .../http/client/ClientProtocolException.java | 3 - .../apache/http/client/HttpResponseException.java | 3 - .../http/client/NonRepeatableRequestException.java | 2 - .../org/apache/http/client/RedirectException.java | 2 - .../org/apache/http/client/config/AuthSchemes.java | 3 - .../org/apache/http/client/config/CookieSpecs.java | 3 - .../apache/http/client/config/RequestConfig.java | 5 +- .../apache/http/client/entity/EntityBuilder.java | 2 - .../entity/LazyDecompressingInputStream.java | 3 - .../http/client/entity/UrlEncodedFormEntity.java | 2 - .../org/apache/http/client/methods/HttpDelete.java | 3 - .../methods/HttpEntityEnclosingRequestBase.java | 2 - .../org/apache/http/client/methods/HttpGet.java | 3 - .../org/apache/http/client/methods/HttpHead.java | 3 - .../apache/http/client/methods/HttpOptions.java | 2 - .../org/apache/http/client/methods/HttpPatch.java | 3 - .../org/apache/http/client/methods/HttpPost.java | 3 - .../org/apache/http/client/methods/HttpPut.java | 3 - .../http/client/methods/HttpRequestBase.java | 2 - .../http/client/methods/HttpRequestWrapper.java | 2 - .../org/apache/http/client/methods/HttpTrace.java | 3 - .../apache/http/client/methods/RequestBuilder.java | 2 - .../http/client/params/HttpClientParamConfig.java | 60 +- .../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 | 3 - .../org/apache/http/client/utils/DateUtils.java | 2 - .../org/apache/http/client/utils/URIBuilder.java | 7 +- .../org/apache/http/client/utils/URIUtils.java | 2 - .../apache/http/client/utils/URLEncodedUtils.java | 24 +- .../apache/http/conn/ConnectTimeoutException.java | 2 - .../http/conn/ConnectionPoolTimeoutException.java | 3 - .../org/apache/http/conn/EofSensorInputStream.java | 23 +- .../apache/http/conn/HttpHostConnectException.java | 2 - .../http/conn/UnsupportedSchemeException.java | 3 - .../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 +- .../org/apache/http/conn/ssl/AbstractVerifier.java | 35 +- .../http/conn/ssl/AllowAllHostnameVerifier.java | 5 +- .../conn/ssl/BrowserCompatHostnameVerifier.java | 5 +- .../http/conn/ssl/DefaultHostnameVerifier.java | 132 +-- .../apache/http/conn/ssl/NoopHostnameVerifier.java | 5 +- .../http/conn/ssl/SSLConnectionSocketFactory.java | 12 +- .../http/conn/ssl/StrictHostnameVerifier.java | 5 +- .../AuthOption.java => conn/ssl/SubjectName.java} | 48 +- .../apache/http/conn/util/InetAddressUtils.java | 3 - .../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 | 3 - .../org/apache/http/cookie/CookieSpecRegistry.java | 5 +- .../http/cookie/MalformedCookieException.java | 2 - .../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 | 33 +- .../org/apache/http/impl/auth/KerberosScheme.java | 2 - .../http/impl/auth/KerberosSchemeFactory.java | 5 +- .../apache/http/impl/auth/NTLMEngineException.java | 2 - .../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 | 3 - .../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 | 14 +- .../org/apache/http/impl/client/HttpClients.java | 2 - .../http/impl/client/InternalHttpClient.java | 9 +- .../http/impl/client/LaxRedirectStrategy.java | 9 +- .../apache/http/impl/client/MinimalHttpClient.java | 5 +- .../http/impl/client/NoopUserTokenHandler.java | 5 +- .../impl/client/ProxyAuthenticationStrategy.java | 5 +- .../apache/http/impl/client/RedirectLocations.java | 3 - .../apache/http/impl/client/RequestWrapper.java | 2 - .../client/StandardHttpRequestRetryHandler.java | 5 +- .../client/SystemDefaultCredentialsProvider.java | 35 +- .../impl/client/TargetAuthenticationStrategy.java | 5 +- .../conn/BasicHttpClientConnectionManager.java | 23 +- .../main/java/org/apache/http/impl/conn/CPool.java | 16 +- .../java/org/apache/http/impl/conn/CPoolEntry.java | 5 +- .../java/org/apache/http/impl/conn/CPoolProxy.java | 2 - .../impl/conn/ConnectionShutdownException.java | 3 - .../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 | 3 - .../conn/LoggingManagedHttpClientConnection.java | 16 +- .../apache/http/impl/conn/LoggingOutputStream.java | 3 - .../conn/ManagedHttpClientConnectionFactory.java | 5 +- .../conn/PoolingHttpClientConnectionManager.java | 24 +- .../http/impl/conn/SystemDefaultRoutePlanner.java | 23 +- .../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 | 11 +- .../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 | 19 +- .../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 | 20 +- .../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 | 3 - .../http/impl/execchain/RequestEntityProxy.java | 2 - .../http/impl/execchain/ResponseEntityProxy.java | 14 +- .../org/apache/http/impl/execchain/RetryExec.java | 5 +- .../execchain/ServiceUnavailableRetryExec.java | 5 +- .../impl/execchain/TunnelRefusedException.java | 2 - .../main/resources/mozilla/public-suffix-list.txt | 937 +++++++++++++++------ .../apache/http/client/utils/TestURIBuilder.java | 7 + .../http/client/utils/TestURLEncodedUtils.java | 22 +- .../http/conn/ssl/CertificatesToPlayWith.java | 41 + .../http/conn/ssl/TestDefaultHostnameVerifier.java | 27 +- .../http/impl/client/TestLaxRedirectStrategy.java} | 47 +- .../impl/cookie/TestBasicCookieAttribHandlers.java | 16 - httpmime/pom.xml | 2 +- pom.xml | 10 +- 339 files changed, 2564 insertions(+), 1492 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-client.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
