[httpcomponents-core] 01/02: Merge tag 'upstream/4.4.1'

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Mon May 4 13:04:14 UTC 2015


This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository httpcomponents-core.

commit 8a5ca265c5b8ac68e50d5d6040766c9d90176963
Merge: 1d2d3d2 f8e5b4a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon May 4 14:59:52 2015 +0200

    Merge tag 'upstream/4.4.1'
    
    Upstream version 4.4.1

 BUILDING.txt                                       |  14 +-
 NOTICE.txt                                         |   2 +-
 README.txt                                         |   2 +-
 RELEASE_NOTES.txt                                  | 112 ++-
 httpcore-ab/pom.xml                                |   4 +-
 .../org/apache/http/benchmark/BenchmarkWorker.java |   3 +-
 .../org/apache/http/benchmark/HttpBenchmark.java   |  77 +-
 .../java/org/apache/http/benchmark/HttpServer.java |   1 +
 .../java/org/apache/http/benchmark/SmokeTest.java  |   1 +
 httpcore-nio/pom.xml                               |   8 +-
 .../org/apache/http/examples/nio/NHttpClient.java  |   2 +-
 .../nio/{NHttpServer.java => NHttpFileServer.java} | 132 +---
 ...{NHttpClient.java => PipeliningHttpClient.java} |  79 +-
 .../apache/http/nio/params/NIOReactorParams.java   |   8 +-
 .../nio/protocol/AsyncNHttpServiceHandler.java     |   6 +-
 .../protocol/HttpAsyncRequestExecutionHandler.java |   2 +-
 .../protocol/HttpAsyncRequestHandlerRegistry.java  |   6 +-
 .../nio/protocol/HttpRequestExecutionHandler.java  |   5 +-
 .../nio/protocol/NHttpRequestExecutionHandler.java |   8 +-
 .../http/nio/protocol/NHttpRequestHandler.java     |   4 +-
 .../nio/protocol/NHttpRequestHandlerRegistry.java  |   6 +-
 .../nio/protocol/NHttpRequestHandlerResolver.java  |   2 +-
 .../http/nio/protocol/NHttpResponseTrigger.java    |   2 +-
 .../nio/protocol/ThrottlingHttpClientHandler.java  |   2 +-
 .../nio/protocol/ThrottlingHttpServiceHandler.java |   2 +-
 .../http/impl/nio/DefaultHttpServerIODispatch.java |   4 +-
 .../impl/nio/DefaultNHttpClientConnection.java     |  25 +-
 .../nio/DefaultNHttpClientConnectionFactory.java   |   1 +
 .../impl/nio/DefaultNHttpServerConnection.java     |  29 +-
 .../nio/DefaultNHttpServerConnectionFactory.java   |   1 +
 .../impl/nio/NHttpClientEventHandlerAdaptor.java   |   9 +
 .../apache/http/impl/nio/NHttpConnectionBase.java  |  95 ++-
 .../impl/nio/NHttpServerEventHandlerAdaptor.java   |   9 +
 .../impl/nio/SSLNHttpClientConnectionFactory.java  |   9 +-
 .../impl/nio/SSLNHttpServerConnectionFactory.java  |   9 +-
 .../apache/http/impl/nio/SessionHttpContext.java   |   3 +
 .../apache/http/impl/nio/bootstrap/HttpServer.java | 146 ++++
 .../http/impl/nio/bootstrap/ServerBootstrap.java   | 393 ++++++++++
 .../http/impl/nio/bootstrap/ThreadFactoryImpl.java |  39 +-
 .../nio/bootstrap/package-info.java}               |  10 +-
 .../impl/nio/codecs/AbstractContentDecoder.java    |   1 +
 .../impl/nio/codecs/AbstractContentEncoder.java    |   2 +
 .../impl/nio/codecs/AbstractMessageParser.java     |   7 +-
 .../impl/nio/codecs/AbstractMessageWriter.java     |   4 +-
 .../apache/http/impl/nio/codecs/ChunkDecoder.java  |  45 +-
 .../apache/http/impl/nio/codecs/ChunkEncoder.java  |   3 +-
 .../impl/nio/codecs/DefaultHttpRequestParser.java  |   6 +-
 .../codecs/DefaultHttpRequestParserFactory.java    |   1 +
 .../impl/nio/codecs/DefaultHttpRequestWriter.java  |   2 +-
 .../codecs/DefaultHttpRequestWriterFactory.java    |   1 +
 .../impl/nio/codecs/DefaultHttpResponseParser.java |   6 +-
 .../codecs/DefaultHttpResponseParserFactory.java   |   1 +
 .../impl/nio/codecs/DefaultHttpResponseWriter.java |   2 +-
 .../codecs/DefaultHttpResponseWriterFactory.java   |   1 +
 .../http/impl/nio/codecs/IdentityDecoder.java      |   2 +
 .../http/impl/nio/codecs/IdentityEncoder.java      |   4 +-
 .../impl/nio/codecs/LengthDelimitedDecoder.java    |   4 +-
 .../impl/nio/codecs/LengthDelimitedEncoder.java    |   6 +-
 .../http/impl/nio/pool/BasicNIOConnFactory.java    |   1 +
 .../http/impl/nio/pool/BasicNIOConnPool.java       |   2 +
 .../http/impl/nio/reactor/AbstractIODispatch.java  |   5 +
 .../http/impl/nio/reactor/AbstractIOReactor.java   |   7 +-
 .../nio/reactor/AbstractMultiworkerIOReactor.java  |  29 +-
 .../http/impl/nio/reactor/BaseIOReactor.java       |  12 +-
 .../apache/http/impl/nio/reactor/ChannelEntry.java |   8 +-
 .../nio/reactor/DefaultConnectingIOReactor.java    |   5 +-
 .../nio/reactor/DefaultListeningIOReactor.java     |  11 +-
 .../http/impl/nio/reactor/IOReactorConfig.java     |  80 +-
 .../http/impl/nio/reactor/IOSessionImpl.java       | 136 ++--
 .../impl/nio/reactor/ListenerEndpointImpl.java     |  13 +-
 .../impl/nio/reactor/SessionInputBufferImpl.java   |  76 +-
 .../impl/nio/reactor/SessionOutputBufferImpl.java  |  11 +-
 .../http/impl/nio/reactor/SessionRequestImpl.java  |  18 +-
 .../java/org/apache/http/nio/ContentDecoder.java   |   6 +-
 .../org/apache/http/nio/ContentDecoderChannel.java |   5 +-
 .../java/org/apache/http/nio/ContentEncoder.java   |   6 +-
 .../org/apache/http/nio/ContentEncoderChannel.java |   5 +-
 .../org/apache/http/nio/FileContentDecoder.java    |   2 +-
 .../org/apache/http/nio/FileContentEncoder.java    |   2 +-
 .../main/java/org/apache/http/nio/IOControl.java   |   2 +-
 .../org/apache/http/nio/NHttpClientConnection.java |   6 +-
 .../apache/http/nio/NHttpClientEventHandler.java   |  10 +-
 .../org/apache/http/nio/NHttpClientHandler.java    |   4 +-
 .../java/org/apache/http/nio/NHttpConnection.java  |  10 +-
 .../org/apache/http/nio/NHttpMessageParser.java    |   4 +-
 .../org/apache/http/nio/NHttpServerConnection.java |   6 +-
 .../apache/http/nio/NHttpServerEventHandler.java   |  10 +-
 .../org/apache/http/nio/NHttpServiceHandler.java   |   6 +-
 .../nio/entity/EntityAsyncContentProducer.java     |   3 +
 .../http/nio/entity/HttpAsyncContentProducer.java  |   6 +-
 .../apache/http/nio/entity/NByteArrayEntity.java   |   7 +
 .../org/apache/http/nio/entity/NFileEntity.java    |  11 +-
 .../org/apache/http/nio/entity/NStringEntity.java  |  17 +-
 .../apache/http/nio/pool/AbstractNIOConnPool.java  |  39 +
 .../nio/protocol/AbstractAsyncRequestConsumer.java |  10 +-
 .../protocol/AbstractAsyncResponseConsumer.java    |  11 +-
 .../protocol/BasicAsyncClientExchangeHandler.java  |  81 +-
 .../nio/protocol/BasicAsyncRequestHandler.java     |   2 +
 .../nio/protocol/BasicAsyncRequestProducer.java    |   8 +
 .../nio/protocol/BasicAsyncResponseProducer.java   |   7 +-
 .../http/nio/protocol/ErrorResponseProducer.java   |   5 +
 .../protocol/HttpAsyncClientExchangeHandler.java   |  18 +-
 .../http/nio/protocol/HttpAsyncExchange.java       |   6 +-
 .../nio/protocol/HttpAsyncExpectationVerifier.java |   4 +-
 .../nio/protocol/HttpAsyncRequestConsumer.java     |  10 +-
 .../nio/protocol/HttpAsyncRequestExecutor.java     | 156 ++--
 .../http/nio/protocol/HttpAsyncRequestHandler.java |   2 +-
 .../protocol/HttpAsyncRequestHandlerMapper.java    |   4 +-
 .../protocol/HttpAsyncRequestHandlerResolver.java  |   4 +-
 .../nio/protocol/HttpAsyncRequestProducer.java     |  10 +-
 .../http/nio/protocol/HttpAsyncRequester.java      | 231 +++++-
 .../nio/protocol/HttpAsyncResponseConsumer.java    |  10 +-
 .../nio/protocol/HttpAsyncResponseProducer.java    |   6 +-
 .../apache/http/nio/protocol/HttpAsyncService.java | 693 +++++++++++------
 .../org/apache/http/nio/protocol/MessageState.java |   2 +-
 .../http/nio/protocol/NullRequestConsumer.java     |   8 +
 .../http/nio/protocol/NullRequestHandler.java      |   2 +
 .../protocol/{MessageState.java => Pipelined.java} |  12 +-
 .../protocol/PipeliningClientExchangeHandler.java  | 315 ++++++++
 .../protocol/UriHttpAsyncRequestHandlerMapper.java |   9 +-
 .../http/nio/reactor/ConnectingIOReactor.java      |   6 +-
 .../nio/reactor/IOReactorExceptionHandler.java     |   8 +-
 .../org/apache/http/nio/reactor/IOSession.java     |  18 +-
 .../apache/http/nio/reactor/ListenerEndpoint.java  |   8 +-
 .../http/nio/reactor/SessionBufferStatus.java      |   8 +-
 .../http/nio/reactor/SessionInputBuffer.java       |  28 +-
 .../http/nio/reactor/SessionOutputBuffer.java      |   4 +-
 .../apache/http/nio/reactor/SessionRequest.java    |  12 +-
 .../apache/http/nio/reactor/SocketAccessor.java    |   4 +-
 .../org/apache/http/nio/reactor/package-info.java  |   2 +-
 .../ssl/PermanentSSLBufferManagementStrategy.java  |  51 +-
 .../ssl/ReleasableSSLBufferManagementStrategy.java |  71 +-
 .../ssl/SSLBuffer.java}                            |  49 +-
 .../SSLBufferManagementStrategy.java}              |  20 +-
 .../apache/http/nio/reactor/ssl/SSLIOSession.java  | 323 ++++++--
 .../http/nio/reactor/ssl/SSLSetupHandler.java      |   1 +
 .../apache/http/nio/util/ContentInputBuffer.java   |  16 +-
 .../apache/http/nio/util/ContentOutputBuffer.java  |  12 +-
 .../http/nio/util/DirectByteBufferAllocator.java   |   1 +
 .../org/apache/http/nio/util/ExpandableBuffer.java |   7 +-
 .../http/nio/util/HeapByteBufferAllocator.java     |   1 +
 .../apache/http/nio/util/SharedInputBuffer.java    |   4 +
 .../apache/http/nio/util/SharedOutputBuffer.java   |   6 +
 .../apache/http/nio/util/SimpleInputBuffer.java    |   4 +
 .../apache/http/nio/util/SimpleOutputBuffer.java   |   6 +
 .../test/java/org/apache/http/ByteChannelMock.java |   4 +
 .../org/apache/http/ReadableByteChannelMock.java   |   7 +-
 .../org/apache/http/WritableByteChannelMock.java   |  10 +-
 .../impl/nio/TestDefaultNHttpClientConnection.java |   4 +
 .../impl/nio/TestDefaultNHttpServerConnection.java |   9 +-
 .../http/impl/nio/TestNHttpConnectionBase.java     |  13 +-
 .../http/impl/nio/codecs/TestChunkDecoder.java     | 237 ++++--
 .../impl/nio/codecs/TestHttpMessageParser.java     |   5 +-
 .../http/impl/nio/codecs/TestIdentityEncoder.java  |  14 +-
 .../nio/codecs/TestLengthDelimitedEncoder.java     |  16 +-
 .../impl/nio/reactor/TestDefaultIOReactors.java    |  47 +-
 .../impl/nio/reactor/TestDefaultIOReactorsSSL.java |  53 --
 .../nio/reactor/TestDefaultListeningIOReactor.java |   5 +
 .../impl/nio/reactor/TestSessionInOutBuffers.java  |  77 +-
 .../nio/integration/RndTestPatternGenerator.java   |   4 +
 .../http/nio/integration/SimpleRequestHandler.java |  22 +-
 .../TestClientOutOfSequenceResponse.java           |   3 +-
 .../apache/http/nio/integration/TestCustomSSL.java |  47 +-
 .../TestHttpAsyncHandlerCancellable.java           |  25 +-
 .../nio/integration/TestHttpAsyncHandlers.java     | 110 ++-
 .../TestHttpAsyncHandlersPipelining.java           | 444 +++++++++++
 .../TestHttpAsyncPrematureTermination.java         |  32 +-
 .../nio/integration/TestHttpsAsyncHandlers.java    |  52 --
 .../nio/integration/TestHttpsAsyncTimeout.java     |  32 +-
 .../http/nio/integration/TestPipelining.java       | 274 -------
 .../nio/integration/TestServerSidePipelining.java  | 363 +++++++++
 .../http/nio/integration/TestTruncatedChunks.java  |  15 +-
 .../org/apache/http/nio/pool/TestNIOConnPool.java  |   6 +
 .../TestBasicAsyncClientExchangeHandler.java       |  20 +-
 .../nio/protocol/TestHttpAsyncRequestExecutor.java |   9 +-
 .../http/nio/protocol/TestHttpAsyncService.java    | 858 ++++++++++++++++-----
 ...onFactory.java => ClientConnectionFactory.java} |  23 +-
 .../apache/http/nio/testserver/HttpClientNio.java  |  87 ++-
 .../http/nio/testserver/HttpCoreNIOTestBase.java   |  63 +-
 .../testserver/LoggingClientConnectionFactory.java |  43 --
 .../http/nio/testserver/LoggingIOSession.java      |  23 +
 .../testserver/LoggingServerConnectionFactory.java |  43 --
 .../http/nio/testserver/SSLTestContexts.java       |  89 ---
 ...onFactory.java => ServerConnectionFactory.java} |  23 +-
 .../SimpleIOReactorExceptionHandler.java           |   2 +
 .../apache/http/nio/util/ContentDecoderMock.java   |   2 +
 .../apache/http/nio/util/ContentEncoderMock.java   |   1 +
 httpcore-osgi/pom.xml                              |   4 +-
 httpcore/pom.xml                                   |   6 +-
 .../apache/http/examples/ElementalHttpPost.java    |   4 +-
 .../apache/http/examples/ElementalHttpServer.java  | 263 -------
 .../org/apache/http/examples/HttpFileServer.java   | 191 +++++
 .../http/impl/SocketHttpClientConnection.java      |   2 +-
 .../http/impl/SocketHttpServerConnection.java      |   2 +-
 .../http/impl/io/AbstractSessionInputBuffer.java   |   4 +-
 .../http/impl/io/AbstractSessionOutputBuffer.java  |   2 +-
 .../org/apache/http/impl/io/SocketInputBuffer.java |   4 +-
 .../apache/http/impl/io/SocketOutputBuffer.java    |   4 +-
 .../apache/http/params/DefaultedHttpParams.java    |   6 +-
 .../apache/http/params/HttpConnectionParams.java   |  16 +-
 .../org/apache/http/params/HttpProtocolParams.java |   8 +-
 .../http/protocol/HttpRequestHandlerRegistry.java  |   6 +-
 .../org/apache/http/util/ExceptionUtils.java       |   8 +-
 .../org/apache/http/ConnectionReuseStrategy.java   |  16 +-
 .../main/java/org/apache/http/ExceptionLogger.java |  37 +-
 httpcore/src/main/java/org/apache/http/Header.java |   2 +-
 .../org/apache/http/HeaderElementIterator.java     |   5 +-
 .../main/java/org/apache/http/HeaderIterator.java  |   5 +-
 .../java/org/apache/http/HttpClientConnection.java |   2 +-
 .../main/java/org/apache/http/HttpConnection.java  |   7 +-
 .../org/apache/http/HttpConnectionMetrics.java     |   2 +-
 .../src/main/java/org/apache/http/HttpEntity.java  |  26 +-
 .../main/java/org/apache/http/HttpException.java   |   6 +-
 .../src/main/java/org/apache/http/HttpHost.java    |  96 ++-
 .../src/main/java/org/apache/http/HttpMessage.java |  16 +-
 .../main/java/org/apache/http/HttpResponse.java    |  16 +-
 .../java/org/apache/http/HttpResponseFactory.java  |   4 +-
 .../src/main/java/org/apache/http/HttpStatus.java  | 105 +--
 .../apache/http/MessageConstraintException.java    |  13 +-
 .../apache/http/MethodNotSupportedException.java   |   4 +-
 .../main/java/org/apache/http/ParseException.java  |   2 +-
 .../java/org/apache/http/ProtocolException.java    |   6 +-
 .../main/java/org/apache/http/ProtocolVersion.java |  23 +-
 .../java/org/apache/http/ReasonPhraseCatalog.java  |   2 +-
 .../main/java/org/apache/http/TokenIterator.java   |   5 +-
 .../{package-info.java => Experimental.java}       |  18 +-
 .../java/org/apache/http/annotation/GuardedBy.java |  18 +-
 .../{package-info.java => Obsolete.java}           |  19 +-
 .../org/apache/http/annotation/package-info.java   |   3 +-
 .../org/apache/http/concurrent/BasicFuture.java    |   8 +-
 .../org/apache/http/concurrent/Cancellable.java    |   2 +-
 .../org/apache/http/config/MessageConstraints.java |   5 +
 .../main/java/org/apache/http/config/Registry.java |   3 +-
 .../org/apache/http/config/RegistryBuilder.java    |   2 +-
 .../java/org/apache/http/config/SocketConfig.java  | 124 ++-
 .../org/apache/http/entity/AbstractHttpEntity.java |  18 +-
 .../org/apache/http/entity/BasicHttpEntity.java    |  10 +-
 .../org/apache/http/entity/BufferedHttpEntity.java |   4 +-
 .../org/apache/http/entity/ByteArrayEntity.java    |   7 +-
 .../java/org/apache/http/entity/ContentType.java   | 168 +++-
 .../org/apache/http/entity/EntityTemplate.java     |   5 +
 .../java/org/apache/http/entity/FileEntity.java    |   7 +-
 .../org/apache/http/entity/HttpEntityWrapper.java  |   9 +
 .../org/apache/http/entity/InputStreamEntity.java  |   5 +
 .../org/apache/http/entity/SerializableEntity.java |   5 +
 .../java/org/apache/http/entity/StringEntity.java  |  14 +-
 .../org/apache/http/impl/BHttpConnectionBase.java  |  44 +-
 .../http/impl/DefaultBHttpClientConnection.java    |  20 +-
 .../impl/DefaultBHttpClientConnectionFactory.java  |   1 +
 .../http/impl/DefaultBHttpServerConnection.java    |  19 +-
 .../impl/DefaultBHttpServerConnectionFactory.java  |   1 +
 .../http/impl/DefaultConnectionReuseStrategy.java  |  17 +-
 .../http/impl/DefaultHttpRequestFactory.java       |   2 +
 .../http/impl/DefaultHttpResponseFactory.java      |   6 +-
 .../http/impl/EnglishReasonPhraseCatalog.java      |   3 +-
 .../http/impl/HttpConnectionMetricsImpl.java       |   6 +
 .../http/impl/NoConnectionReuseStrategy.java       |   1 +
 .../org/apache/http/impl/bootstrap/HttpServer.java | 179 +++++
 .../http/impl/bootstrap/RequestListener.java       | 106 +++
 .../bootstrap/SSLServerSetupHandler.java}          |  27 +-
 .../http/impl/bootstrap/ServerBootstrap.java       | 412 ++++++++++
 .../bootstrap/ThreadFactoryImpl.java}              |  39 +-
 .../org/apache/http/impl/bootstrap/Worker.java     |  81 ++
 .../apache/http/impl/bootstrap/package-info.java   |  10 +-
 .../DisallowIdentityContentLengthStrategy.java     |   1 +
 .../http/impl/entity/LaxContentLengthStrategy.java |   9 +-
 .../impl/entity/StrictContentLengthStrategy.java   |   7 +-
 .../apache/http/impl/io/AbstractMessageParser.java |   7 +-
 .../apache/http/impl/io/AbstractMessageWriter.java |   3 +-
 .../apache/http/impl/io/ChunkedInputStream.java    |  59 +-
 .../http/impl/io/ContentLengthInputStream.java     |   4 +-
 .../http/impl/io/ContentLengthOutputStream.java    |   2 +-
 .../http/impl/io/DefaultHttpRequestParser.java     |   6 +-
 .../impl/io/DefaultHttpRequestParserFactory.java   |   1 +
 .../http/impl/io/DefaultHttpRequestWriter.java     |   2 +-
 .../impl/io/DefaultHttpRequestWriterFactory.java   |   1 +
 .../http/impl/io/DefaultHttpResponseParser.java    |   6 +-
 .../impl/io/DefaultHttpResponseParserFactory.java  |   1 +
 .../http/impl/io/DefaultHttpResponseWriter.java    |   2 +-
 .../impl/io/DefaultHttpResponseWriterFactory.java  |   1 +
 ...sportMetricsImpl.java => EmptyInputStream.java} |  55 +-
 .../http/impl/io/HttpTransportMetricsImpl.java     |   2 +
 .../apache/http/impl/io/IdentityInputStream.java   |   2 +-
 .../http/impl/io/SessionInputBufferImpl.java       |  59 +-
 .../http/impl/io/SessionOutputBufferImpl.java      |  16 +-
 .../apache/http/impl/pool/BasicConnFactory.java    |   9 +-
 .../org/apache/http/impl/pool/BasicConnPool.java   |   5 +
 .../org/apache/http/io/SessionInputBuffer.java     |  36 +-
 .../org/apache/http/io/SessionOutputBuffer.java    |  16 +-
 .../apache/http/message/AbstractHttpMessage.java   |  16 +
 .../java/org/apache/http/message/BasicHeader.java  |   3 +
 .../apache/http/message/BasicHeaderElement.java    |  12 +-
 .../http/message/BasicHeaderElementIterator.java   |   4 +
 .../apache/http/message/BasicHeaderIterator.java   |  12 +-
 .../http/message/BasicHeaderValueFormatter.java    |  52 +-
 .../http/message/BasicHeaderValueParser.java       | 167 ++--
 .../message/BasicHttpEntityEnclosingRequest.java   |   3 +
 .../org/apache/http/message/BasicHttpRequest.java  |   2 +
 .../org/apache/http/message/BasicHttpResponse.java |  19 +-
 .../apache/http/message/BasicLineFormatter.java    |  28 +-
 .../org/apache/http/message/BasicLineParser.java   |   7 +-
 .../http/message/BasicListHeaderIterator.java      |  12 +-
 .../apache/http/message/BasicNameValuePair.java    |   2 +
 .../org/apache/http/message/BasicRequestLine.java  |   3 +
 .../org/apache/http/message/BasicStatusLine.java   |   5 +-
 .../apache/http/message/BasicTokenIterator.java    |  33 +-
 .../org/apache/http/message/BufferedHeader.java    |   5 +
 .../java/org/apache/http/message/HeaderGroup.java  |  18 +-
 .../apache/http/message/HeaderValueFormatter.java  |  32 +-
 .../org/apache/http/message/HeaderValueParser.java |   8 +-
 .../org/apache/http/message/LineFormatter.java     |  21 +-
 .../java/org/apache/http/message/LineParser.java   |   4 +-
 .../java/org/apache/http/message/TokenParser.java  | 267 +++++++
 .../main/java/org/apache/http/package-info.java    |   3 +-
 .../org/apache/http/params/AbstractHttpParams.java |  13 +-
 .../org/apache/http/params/BasicHttpParams.java    |   6 +-
 .../apache/http/params/CoreConnectionPNames.java   |   6 +-
 .../org/apache/http/params/CoreProtocolPNames.java |   6 +-
 .../java/org/apache/http/params/HttpParams.java    |  18 +-
 .../org/apache/http/params/HttpParamsNames.java    |   2 +-
 .../org/apache/http/pool/AbstractConnPool.java     |  86 ++-
 .../main/java/org/apache/http/pool/ConnPool.java   |   4 +-
 .../main/java/org/apache/http/pool/PoolEntry.java  |  37 +-
 .../java/org/apache/http/pool/PoolEntryFuture.java |   5 +
 .../org/apache/http/protocol/BasicHttpContext.java |   3 +
 .../java/org/apache/http/protocol/HttpContext.java |   6 +-
 .../org/apache/http/protocol/HttpCoreContext.java  |   3 +
 .../http/protocol/HttpExpectationVerifier.java     |   4 +-
 .../apache/http/protocol/HttpRequestExecutor.java  |  13 +-
 .../http/protocol/HttpRequestHandlerMapper.java    |   2 +-
 .../http/protocol/HttpRequestHandlerResolver.java  |   2 +-
 .../http/protocol/HttpRequestInterceptorList.java  |   2 +-
 .../http/protocol/HttpResponseInterceptorList.java |   2 +-
 .../java/org/apache/http/protocol/HttpService.java |  42 +-
 .../http/protocol/ImmutableHttpProcessor.java      |   2 +
 .../apache/http/protocol/RequestConnControl.java   |   5 +-
 .../org/apache/http/protocol/RequestContent.java   |  13 +-
 .../java/org/apache/http/protocol/RequestDate.java |   3 +-
 .../http/protocol/RequestExpectContinue.java       |   3 +-
 .../apache/http/protocol/RequestTargetHost.java    |   3 +-
 .../org/apache/http/protocol/RequestUserAgent.java |   3 +-
 .../apache/http/protocol/ResponseConnControl.java  |   5 +-
 .../org/apache/http/protocol/ResponseContent.java  |  13 +-
 .../org/apache/http/protocol/ResponseDate.java     |   3 +-
 .../org/apache/http/protocol/ResponseServer.java   |   3 +-
 .../http/protocol/UriHttpRequestHandlerMapper.java |   9 +-
 .../apache/http/protocol/UriPatternMatcher.java    |  12 +-
 .../Registry.java => ssl/PrivateKeyDetails.java}   |  38 +-
 .../org/apache/http/ssl/PrivateKeyStrategy.java    |  20 +-
 .../org/apache/http/ssl/SSLContextBuilder.java     | 400 ++++++++++
 .../main/java/org/apache/http/ssl/SSLContexts.java |  90 +++
 .../SSLInitializationException.java}               |  16 +-
 .../java/org/apache/http/ssl/TrustStrategy.java    |  57 ++
 .../java/org/apache/http/ssl/package-info.java     |  11 +-
 .../src/main/java/org/apache/http/util/Args.java   |  16 +
 .../main/java/org/apache/http/util/Asserts.java    |   6 +
 .../java/org/apache/http/util/ByteArrayBuffer.java |  84 +-
 .../java/org/apache/http/util/CharArrayBuffer.java | 178 +++--
 .../java/org/apache/http/util/EncodingUtils.java   |  12 +-
 .../java/org/apache/http/util/EntityUtils.java     |  19 +-
 .../main/java/org/apache/http/util/LangUtils.java  |   1 -
 .../main/java/org/apache/http/util/TextUtils.java  |  21 +
 .../java/org/apache/http/util/VersionInfo.java     |  44 +-
 .../test/java/org/apache/http/TestHttpHost.java    |  61 +-
 .../http/concurrent/BasicFutureCallback.java       |   3 +
 .../apache/http/entity/TestBasicHttpEntity.java    |   6 +-
 .../apache/http/entity/TestBufferedHttpEntity.java |   8 +-
 .../apache/http/entity/TestByteArrayEntity.java    |  14 +-
 .../org/apache/http/entity/TestContentType.java    |  78 +-
 .../org/apache/http/entity/TestEntityTemplate.java |   3 +
 .../apache/http/entity/TestHttpEntityWrapper.java  |   2 +-
 .../apache/http/entity/TestInputStreamEntity.java  |   8 +-
 .../org/apache/http/entity/TestStringEntity.java   |   4 +-
 .../apache/http/impl/SessionInputBufferMock.java   |  24 +-
 .../apache/http/impl/TestBHttpConnectionBase.java  |   3 +-
 .../impl/TestDefaultBHttpClientConnection.java     |   9 +-
 .../impl/TestDefaultBHttpServerConnection.java     |   9 +-
 .../apache/http/impl/entity/DummyHttpMessage.java  |   1 +
 .../org/apache/http/impl/io/TestChunkCoding.java   | 190 +++--
 .../http/impl/io/TestContentLengthInputStream.java |  16 +-
 .../org/apache/http/impl/io/TestRequestParser.java |   2 +-
 .../apache/http/impl/io/TestResponseParser.java    |   2 +-
 .../http/impl/io/TestSessionInOutBuffers.java      |  64 +-
 .../org/apache/http/integration/TestSyncHttp.java  |  28 +-
 .../apache/http/message/TestAbstractMessage.java   |   1 +
 .../http/message/TestBasicHeaderValueParser.java   |  18 +-
 .../org/apache/http/message/TestTokenParser.java   | 193 +++++
 .../java/org/apache/http/pool/TestConnPool.java    |  68 ++
 .../java/org/apache/http/pool/TestPoolEntry.java   |   8 +-
 .../org/apache/http/protocol/TestHttpService.java  |  81 +-
 .../org/apache/http/ssl/TestSSLContextBuilder.java | 609 +++++++++++++++
 .../org/apache/http/testserver/HttpServer.java     | 168 ++--
 .../org/apache/http/util/TestByteArrayBuffer.java  |   3 +-
 .../org/apache/http/util/TestCharArrayBuffer.java  |  29 +-
 .../java/org/apache/http/util/TestEntityUtils.java |  34 +-
 .../java/org/apache/http/util/TestTextUtils.java}  |  50 +-
 httpcore/src/test/resources/CA/ca-cert.pem         |  23 +
 httpcore/src/test/resources/CA/ca-key.pem          |  30 +
 httpcore/src/test/resources/CA/openssl.cnf         | 357 +++++++++
 httpcore/src/test/resources/test-client.keystore   | Bin 0 -> 6005 bytes
 .../src/test/resources/test-keypasswd.keystore     | Bin 0 -> 1378 bytes
 httpcore/src/test/resources/test-server.keystore   | Bin 0 -> 3518 bytes
 httpcore/src/test/resources/test.keystore          | Bin 0 -> 1344 bytes
 pom.xml                                            |  31 +-
 src/docbkx/blocking-io.xml                         | 555 +++++++++++++
 src/docbkx/fundamentals.xml                        | 491 +-----------
 src/docbkx/index.xml                               |   3 +-
 src/docbkx/{nio-ext.xml => nio.xml}                |  91 ++-
 408 files changed, 11242 insertions(+), 4359 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-core.git



More information about the pkg-java-commits mailing list