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 c608e655c75886aeaa6cc9b98572e6f2f1cfbe98 Merge: 6986cc3 89519e1 Author: Emmanuel Bourg <[email protected]> Date: Mon Aug 5 18:29:15 2013 +0200 Merge tag 'upstream/4.3' Upstream version 4.3 BUILDING.txt | 39 +- LICENSE.txt | 5 +- RELEASE_NOTES.txt | 281 +++-- httpcore-ab/pom.xml | 35 +- .../apache/http/benchmark/BenchmarkConnection.java | 49 +- .../org/apache/http/benchmark/BenchmarkWorker.java | 135 +-- .../apache/http/benchmark/CommandLineUtils.java | 70 +- .../java/org/apache/http/benchmark/Config.java | 73 +- .../apache/http/benchmark/CountingInputStream.java | 18 +- .../http/benchmark/CountingOutputStream.java | 10 +- .../org/apache/http/benchmark/HttpBenchmark.java | 124 +-- .../org/apache/http/benchmark/ResultProcessor.java | 97 +- .../java/org/apache/http/benchmark/Results.java | 133 +++ .../main/java/org/apache/http/benchmark/Stats.java | 6 +- .../org/apache/http/benchmark}/HttpServer.java | 81 +- .../java/org/apache/http/benchmark/SmokeTest.java | 90 ++ httpcore-benchmark/pom.xml | 129 --- .../java/org/apache/http/benchmark/Benchmark.java | 96 -- .../http/benchmark/httpcore/HttpCoreNIOServer.java | 141 --- .../http/benchmark/httpcore/HttpCoreServer.java | 154 --- .../http/benchmark/httpcore/HttpListener.java | 104 -- .../apache/http/benchmark/httpcore/HttpWorker.java | 97 -- .../http/benchmark/httpcore/NHttpListener.java | 80 -- .../benchmark/httpcore/NRandomDataHandler.java | 204 ---- .../http/benchmark/httpcore/RandomDataHandler.java | 132 --- .../benchmark/httpcore/StdHttpWorkerCallback.java | 67 -- .../http/benchmark/jetty/JettyNIOServer.java | 104 -- .../apache/http/benchmark/jetty/JettyServer.java | 104 -- .../http/benchmark/jetty/RandomDataHandler.java | 95 -- .../httpcore-tutorial-simplified-chinese.pdf | Bin 851769 -> 0 bytes httpcore-contrib/pom.xml | 87 -- .../contrib/compress/GzipCompressingEntity.java | 86 -- .../contrib/compress/GzipDecompressingEntity.java | 65 -- .../contrib/compress/ResponseGzipCompress.java | 73 -- .../contrib/compress/ResponseGzipUncompress.java | 70 -- .../http/contrib/logging/LoggingIOSession.java | 234 ---- .../LoggingNHttpClientConnectionFactory.java | 62 -- .../contrib/logging/LoggingNHttpClientHandler.java | 139 --- .../LoggingNHttpServerConnectionFactory.java | 62 -- .../logging/LoggingNHttpServiceHandler.java | 138 --- .../http/contrib/sip/BasicCompactHeader.java | 114 -- .../http/contrib/sip/BasicCompactHeaderMapper.java | 208 ---- .../http/contrib/sip/BasicSipLineParser.java | 77 -- .../http/contrib/sip/BufferedCompactHeader.java | 166 --- .../org/apache/http/contrib/sip/CompactHeader.java | 60 - .../http/contrib/sip/CompactHeaderMapper.java | 95 -- .../contrib/sip/EnglishSipReasonPhraseCatalog.java | 266 ----- .../org/apache/http/contrib/sip/SipException.java | 73 -- .../org/apache/http/contrib/sip/SipStatus.java | 267 ----- .../org/apache/http/contrib/sip/SipVersion.java | 89 -- httpcore-nio/pom.xml | 58 +- .../org/apache/http/examples/nio/NHttpClient.java | 43 +- .../http/examples/nio/NHttpReverseProxy.java | 70 +- .../org/apache/http/examples/nio/NHttpServer.java | 61 +- .../impl/nio/DefaultClientIOEventDispatch.java | 40 +- .../impl/nio/DefaultServerIOEventDispatch.java | 36 +- .../http/impl/nio/SSLClientIOEventDispatch.java | 56 +- .../http/impl/nio/SSLServerIOEventDispatch.java | 54 +- .../http/impl/nio/codecs/HttpRequestParser.java | 16 +- .../http/impl/nio/codecs/HttpRequestWriter.java | 4 +- .../http/impl/nio/codecs/HttpResponseParser.java | 16 +- .../http/impl/nio/codecs/HttpResponseWriter.java | 4 +- .../apache/http/impl/nio/reactor/SSLIOSession.java | 2 +- .../http/impl/nio/reactor/SSLIOSessionHandler.java | 0 .../nio/reactor/SSLIOSessionHandlerAdaptor.java | 0 .../org/apache/http/impl/nio/reactor/SSLMode.java | 2 +- .../http/impl/nio/reactor/SSLSetupHandler.java | 0 .../impl/nio/reactor/SSLSetupHandlerAdaptor.java | 0 .../http/impl/nio/reactor/SessionHandle.java | 13 +- .../impl/nio/ssl/SSLClientIOEventDispatch.java | 37 +- .../impl/nio/ssl/SSLServerIOEventDispatch.java | 35 +- .../org/apache/http/impl/nio/ssl/package.html | 0 .../http/nio/params/NIOReactorParamBean.java | 7 +- .../apache/http/nio/params/NIOReactorParams.java | 44 +- .../http/nio/protocol/AsyncNHttpClientHandler.java | 83 +- .../nio/protocol/AsyncNHttpServiceHandler.java | 131 ++- .../BasicAsyncRequestExecutionHandler.java | 50 +- .../nio/protocol/BufferingHttpClientHandler.java | 13 +- .../nio/protocol/BufferingHttpServiceHandler.java | 17 +- .../apache/http/nio/protocol/EventListener.java | 0 .../protocol/HttpAsyncRequestExecutionHandler.java | 3 + .../protocol/HttpAsyncRequestHandlerRegistry.java | 6 +- .../nio/protocol/HttpRequestExecutionHandler.java | 3 +- .../apache/http/nio/protocol/NHttpHandlerBase.java | 27 +- .../nio/protocol/NHttpRequestExecutionHandler.java | 6 +- .../http/nio/protocol/NHttpRequestHandler.java | 0 .../nio/protocol/NHttpRequestHandlerRegistry.java | 4 +- .../nio/protocol/NHttpRequestHandlerResolver.java | 0 .../http/nio/protocol/NHttpResponseTrigger.java | 0 .../apache/http/nio/protocol/NullNHttpEntity.java | 7 +- .../nio/protocol/SimpleNHttpRequestHandler.java | 0 .../nio/protocol/ThrottlingHttpClientHandler.java | 109 +- .../nio/protocol/ThrottlingHttpServiceHandler.java | 123 +-- .../http/impl/nio/DefaultHttpClientIODispatch.java | 70 +- .../http/impl/nio/DefaultHttpServerIODispatch.java | 68 +- .../impl/nio/DefaultNHttpClientConnection.java | 181 +++- .../nio/DefaultNHttpClientConnectionFactory.java | 143 ++- .../impl/nio/DefaultNHttpServerConnection.java | 191 +++- .../nio/DefaultNHttpServerConnectionFactory.java | 130 ++- .../impl/nio/NHttpClientEventHandlerAdaptor.java | 2 +- .../apache/http/impl/nio/NHttpConnectionBase.java | 183 +++- .../org/apache/http/impl/nio/SSLContextUtils.java} | 34 +- .../impl/nio/SSLNHttpClientConnectionFactory.java | 197 +++- .../impl/nio/SSLNHttpServerConnectionFactory.java | 196 +++- .../impl/nio/codecs/AbstractContentDecoder.java | 75 +- .../impl/nio/codecs/AbstractContentEncoder.java | 113 +- .../impl/nio/codecs/AbstractMessageParser.java | 108 +- .../impl/nio/codecs/AbstractMessageWriter.java | 42 +- .../apache/http/impl/nio/codecs/ChunkDecoder.java | 44 +- .../apache/http/impl/nio/codecs/ChunkEncoder.java | 109 +- .../impl/nio/codecs/DefaultHttpRequestParser.java | 73 +- ...r.java => DefaultHttpRequestParserFactory.java} | 59 +- .../impl/nio/codecs/DefaultHttpRequestWriter.java | 34 +- ...r.java => DefaultHttpRequestWriterFactory.java} | 38 +- .../impl/nio/codecs/DefaultHttpResponseParser.java | 68 +- .../codecs/DefaultHttpResponseParserFactory.java | 71 ++ .../impl/nio/codecs/DefaultHttpResponseWriter.java | 34 +- ....java => DefaultHttpResponseWriterFactory.java} | 38 +- .../http/impl/nio/codecs/IdentityDecoder.java | 20 +- .../http/impl/nio/codecs/IdentityEncoder.java | 72 +- .../impl/nio/codecs/LengthDelimitedDecoder.java | 47 +- .../impl/nio/codecs/LengthDelimitedEncoder.java | 119 +- .../http/impl/nio/pool/BasicNIOConnFactory.java | 73 +- .../http/impl/nio/pool/BasicNIOConnPool.java | 139 ++- .../http/impl/nio/pool/BasicNIOPoolEntry.java | 12 +- .../http/impl/nio/reactor/AbstractIODispatch.java | 31 +- .../http/impl/nio/reactor/AbstractIOReactor.java | 121 +-- .../nio/reactor/AbstractMultiworkerIOReactor.java | 143 +-- .../http/impl/nio/reactor/BaseIOReactor.java | 54 +- .../apache/http/impl/nio/reactor/ChannelEntry.java | 5 +- .../nio/reactor/DefaultConnectingIOReactor.java | 75 +- .../nio/reactor/DefaultListeningIOReactor.java | 63 +- .../http/impl/nio/reactor/ExceptionEvent.java | 2 +- .../http/impl/nio/reactor/IOReactorConfig.java | 297 +++-- .../http/impl/nio/reactor/IOSessionImpl.java | 53 +- .../http/impl/nio/reactor/InterestOpEntry.java | 20 +- .../impl/nio/reactor/ListenerEndpointImpl.java | 13 +- .../impl/nio/reactor/SessionInputBufferImpl.java | 225 ++-- .../impl/nio/reactor/SessionOutputBufferImpl.java | 207 +++- .../impl/nio/reactor/SessionRequestHandle.java | 10 +- .../http/impl/nio/reactor/SessionRequestImpl.java | 31 +- .../org/apache/http/nio/ContentDecoderChannel.java | 4 +- .../org/apache/http/nio/ContentEncoderChannel.java | 6 +- .../org/apache/http/nio/FileContentEncoder.java | 1 - .../org/apache/http/nio/NHttpClientIOTarget.java | 6 +- .../apache/http/nio/NHttpMessageParserFactory.java | 20 +- .../apache/http/nio/NHttpMessageWriterFactory.java | 13 +- .../org/apache/http/nio/NHttpServerIOTarget.java | 6 +- .../http/nio/entity/BufferingNHttpEntity.java | 28 +- .../http/nio/entity/ConsumingNHttpEntity.java | 6 +- .../nio/entity/ConsumingNHttpEntityTemplate.java | 19 +- .../http/nio/entity/ContentBufferEntity.java | 7 +- .../apache/http/nio/entity/ContentInputStream.java | 9 +- .../apache/http/nio/entity/ContentListener.java | 2 +- .../http/nio/entity/ContentOutputStream.java | 11 +- .../nio/entity/EntityAsyncContentProducer.java | 16 +- .../apache/http/nio/entity/NByteArrayEntity.java | 18 +- .../org/apache/http/nio/entity/NFileEntity.java | 46 +- .../apache/http/nio/entity/NHttpEntityWrapper.java | 19 +- .../org/apache/http/nio/entity/NStringEntity.java | 19 +- .../http/nio/entity/ProducingNHttpEntity.java | 6 +- .../http/nio/entity/SkipContentListener.java | 5 +- .../java/org/apache/http/nio/entity/package.html | 2 +- .../apache/http/nio/params/NIOReactorPNames.java | 4 +- .../apache/http/nio/pool/AbstractNIOConnPool.java | 573 ++++++---- .../org/apache/http/nio/pool/LeaseRequest.java | 45 +- .../apache/http/nio/pool/RouteSpecificPool.java | 53 +- .../http/nio/pool/SocketAddressResolver.java | 21 +- .../nio/protocol/AbstractAsyncRequestConsumer.java | 15 +- .../protocol/AbstractAsyncResponseConsumer.java | 17 +- ...r.java => BasicAsyncClientExchangeHandler.java} | 185 ++-- .../nio/protocol/BasicAsyncRequestConsumer.java | 5 +- .../nio/protocol/BasicAsyncRequestHandler.java | 5 +- .../nio/protocol/BasicAsyncRequestProducer.java | 23 +- .../nio/protocol/BasicAsyncResponseConsumer.java | 5 +- .../nio/protocol/BasicAsyncResponseProducer.java | 15 +- ...er.java => HttpAsyncClientExchangeHandler.java} | 100 +- .../http/nio/protocol/HttpAsyncExchange.java | 9 +- .../nio/protocol/HttpAsyncRequestConsumer.java | 5 +- .../nio/protocol/HttpAsyncRequestExecutor.java | 194 ++-- ...ver.java => HttpAsyncRequestHandlerMapper.java} | 19 +- .../protocol/HttpAsyncRequestHandlerResolver.java | 6 +- .../nio/protocol/HttpAsyncRequestProducer.java | 8 +- .../http/nio/protocol/HttpAsyncRequester.java | 150 ++- .../nio/protocol/HttpAsyncResponseProducer.java | 3 - .../apache/http/nio/protocol/HttpAsyncService.java | 289 ++--- .../http/nio/protocol/NullRequestConsumer.java | 2 +- .../http/nio/protocol/NullRequestHandler.java | 2 +- ....java => UriHttpAsyncRequestHandlerMapper.java} | 54 +- .../apache/http/nio/reactor/IOReactorStatus.java | 2 +- .../org/apache/http/nio/reactor/IOSession.java | 2 - .../http/nio/reactor/ListeningIOReactor.java | 2 +- .../http/nio/reactor/SessionBufferStatus.java | 3 - .../http/nio/reactor/SessionInputBuffer.java | 4 +- .../apache/http/nio/reactor/SocketAccessor.java | 2 +- .../apache/http/nio/reactor/ssl/SSLIOSession.java | 109 +- .../apache/http/nio/util/ContentInputBuffer.java | 5 +- .../apache/http/nio/util/ContentOutputBuffer.java | 5 +- .../http/nio/util/DirectByteBufferAllocator.java | 8 +- .../org/apache/http/nio/util/ExpandableBuffer.java | 19 +- .../http/nio/util/HeapByteBufferAllocator.java | 8 +- .../apache/http/nio/util/SharedInputBuffer.java | 53 +- .../apache/http/nio/util/SharedOutputBuffer.java | 77 +- .../apache/http/nio/util/SimpleInputBuffer.java | 11 +- .../apache/http/nio/util/SimpleOutputBuffer.java | 15 +- .../org/apache/http/nio/version.properties | 2 +- httpcore-nio/src/site/apt/index.apt | 44 - httpcore-nio/src/site/resources/css/site.css | 1 - httpcore-nio/src/site/site.xml | 40 - ...ontentDecoderMock.java => ByteChannelMock.java} | 49 +- .../java/org/apache/http/HttpCoreNIOTestBase.java | 155 --- .../http/LoggingClientConnectionFactory.java | 52 - .../http/LoggingServerConnectionFactory.java | 52 - .../org/apache/http/ReadableByteChannelMock.java | 21 +- .../org/apache/http/WritableByteChannelMock.java | 158 +++ .../apache/http/impl/nio/TestContentChannel.java | 6 +- .../impl/nio/TestDefaultNHttpClientConnection.java | 670 ++++++++++++ .../impl/nio/TestDefaultNHttpServerConnection.java | 672 ++++++++++++ .../http/impl/nio/TestNHttpConnectionBase.java | 277 +++++ .../nio/codecs/CodecTestUtils.java} | 58 +- .../http/impl/nio/codecs/TestChunkDecoder.java | 274 +++-- .../http/impl/nio/codecs/TestChunkEncoder.java | 235 ++-- .../impl/nio/codecs/TestHttpMessageParser.java | 189 ++-- .../http/impl/nio/codecs/TestIdentityDecoder.java | 292 +++-- .../http/impl/nio/codecs/TestIdentityEncoder.java | 520 ++++++++- .../nio/codecs/TestLengthDelimitedDecoder.java | 303 +++--- .../nio/codecs/TestLengthDelimitedEncoder.java | 672 +++++++++--- .../http/impl/nio/pool/TestBasicNIOConnPool.java | 98 +- .../http/impl/nio/reactor/ExceptionEventTest.java | 4 +- .../impl/nio/reactor/TestBaseIOReactorSSL.java | 170 --- .../impl/nio/reactor/TestDefaultIOReactors.java | 148 +-- .../impl/nio/reactor/TestDefaultIOReactorsSSL.java | 17 +- .../nio/reactor/TestDefaultListeningIOReactor.java | 59 +- .../impl/nio/reactor/TestSessionInOutBuffers.java | 359 +++--- .../java/org/apache/http/nio/integration/Job.java | 139 --- .../nio/integration/RequestExecutionHandler.java | 106 -- .../http/nio/integration/RequestHandler.java | 103 -- .../nio/integration/RndTestPatternGenerator.java | 6 +- .../http/nio/integration/SimpleRequestHandler.java | 16 +- .../nio/integration/TestAsyncNHttpHandlers.java | 1141 -------------------- .../apache/http/nio/integration/TestCustomSSL.java | 148 +++ .../TestHttpAsyncHandlerCancellable.java | 112 +- .../nio/integration/TestHttpAsyncHandlers.java | 563 +++++----- .../TestHttpAsyncPrematureTermination.java | 129 +-- .../nio/integration/TestHttpsAsyncHandlers.java | 17 +- .../nio/integration/TestHttpsAsyncTimeout.java | 67 +- .../http/nio/integration/TestPipelining.java | 91 +- .../integration/TestThrottlingNHttpHandlers.java | 853 --------------- .../http/nio/integration/TestTruncatedChunks.java | 145 +-- .../org/apache/http/nio/pool/TestNIOConnPool.java | 393 ++++--- .../http/nio/pool/TestRouteSpecificPool.java | 175 ++- ...va => TestBasicAsyncClientExchangeHandler.java} | 169 ++- .../protocol/TestBasicAsyncRequestConsumer.java | 4 +- .../nio/protocol/TestBasicAsyncRequestHandler.java | 7 +- .../protocol/TestBasicAsyncRequestProducer.java | 12 +- .../protocol/TestBasicAsyncResponseConsumer.java | 8 +- .../protocol/TestBasicAsyncResponseProducer.java | 12 +- .../nio/protocol/TestErrorResponseProducer.java | 7 +- .../nio/protocol/TestHttpAsyncRequestExecutor.java | 211 ++-- .../http/nio/protocol/TestHttpAsyncRequester.java | 104 +- .../http/nio/protocol/TestHttpAsyncService.java | 298 +++-- .../TestUriHttpAsyncRequestHandlerMapper.java | 107 ++ .../apache/http/nio/testserver/HttpClientNio.java | 312 ++++++ .../http/nio/testserver/HttpCoreNIOTestBase.java | 87 ++ .../http/{ => nio}/testserver/HttpServerNio.java | 74 +- .../LoggingClientConnectionFactory.java} | 19 +- .../{ => nio/testserver}/LoggingIOSession.java | 29 +- .../testserver}/LoggingNHttpClientConnection.java | 28 +- .../testserver}/LoggingNHttpServerConnection.java | 28 +- .../LoggingSSLClientConnectionFactory.java | 39 +- .../LoggingSSLServerConnectionFactory.java | 39 +- .../LoggingServerConnectionFactory.java} | 20 +- .../http/{ => nio/testserver}/SSLTestContexts.java | 36 +- .../SimpleIOReactorExceptionHandler.java | 5 +- .../org/apache/http/{ => nio/testserver}/Wire.java | 24 +- .../apache/http/nio/util/ContentDecoderMock.java | 5 +- .../apache/http/nio/util/ContentEncoderMock.java | 18 +- .../java/org/apache/http/nio/util/TestBuffers.java | 58 +- .../org/apache/http/testserver/HttpClientNio.java | 145 --- .../testserver/NHttpClientEventHandlerAdaptor.java | 101 -- .../testserver/NHttpServerEventHandlerAdaptor.java | 101 -- httpcore-osgi/pom.xml | 34 +- .../src/main/appended-resources/META-INF/LICENSE | 180 +-- .../src/main/appended-resources/META-INF/NOTICE | 2 + httpcore/pom.xml | 78 +- .../org/apache/http/examples/ElementalHttpGet.java | 59 +- .../apache/http/examples/ElementalHttpPost.java | 71 +- .../apache/http/examples/ElementalHttpServer.java | 113 +- .../http/examples/ElementalPoolingHttpGet.java | 54 +- .../http/examples/ElementalReverseProxy.java | 104 +- .../src/main/appended-resources/META-INF/LICENSE | 180 +-- .../src/main/appended-resources/META-INF/NOTICE | 2 + .../http/impl/AbstractHttpClientConnection.java | 60 +- .../http/impl/AbstractHttpServerConnection.java | 47 +- .../http/impl/DefaultHttpClientConnection.java | 37 +- .../http/impl/DefaultHttpServerConnection.java | 40 +- .../http/impl/SocketHttpClientConnection.java | 65 +- .../http/impl/SocketHttpServerConnection.java | 71 +- .../http/impl/entity/EntityDeserializer.java | 25 +- .../apache/http/impl/entity/EntitySerializer.java | 25 +- .../http/impl/io/AbstractSessionInputBuffer.java | 130 ++- .../http/impl/io/AbstractSessionOutputBuffer.java | 110 +- .../org/apache/http/impl/io/HttpRequestParser.java | 19 +- .../org/apache/http/impl/io/HttpRequestWriter.java | 3 + .../apache/http/impl/io/HttpResponseParser.java | 19 +- .../apache/http/impl/io/HttpResponseWriter.java | 3 + .../org/apache/http/impl/io/SocketInputBuffer.java | 42 +- .../apache/http/impl/io/SocketOutputBuffer.java | 32 +- .../apache/http/params/DefaultedHttpParams.java | 22 +- .../apache/http/params/HttpAbstractParamBean.java | 11 +- .../http/params/HttpConnectionParamBean.java | 16 +- .../apache/http/params/HttpConnectionParams.java | 107 +- .../apache/http/params/HttpProtocolParamBean.java | 6 +- .../org/apache/http/params/HttpProtocolParams.java | 81 +- .../apache/http/params/SyncBasicHttpParams.java | 6 +- .../apache/http/protocol/BasicHttpProcessor.java | 53 +- .../apache/http/protocol/DefaultedHttpContext.java | 15 +- .../org/apache/http/protocol/ExecutionContext.java | 6 + .../http/protocol/HttpRequestHandlerRegistry.java | 11 +- .../apache/http/protocol/SyncBasicHttpContext.java | 2 +- .../org/apache/http/util/ExceptionUtils.java | 10 +- .../org/apache/http/ContentTooLongException.java | 2 +- .../main/java/org/apache/http/HeaderElement.java | 2 +- .../EofSensor.java => HttpConnectionFactory.java} | 13 +- .../apache/http/HttpEntityEnclosingRequest.java | 2 - .../src/main/java/org/apache/http/HttpHost.java | 92 +- .../src/main/java/org/apache/http/HttpMessage.java | 9 + .../main/java/org/apache/http/HttpResponse.java | 15 +- .../src/main/java/org/apache/http/HttpVersion.java | 4 +- ...eption.java => MessageConstraintException.java} | 14 +- .../org/apache/http/NoHttpResponseException.java | 2 +- .../main/java/org/apache/http/ParseException.java | 2 +- .../java/org/apache/http/ProtocolException.java | 4 +- .../main/java/org/apache/http/ProtocolVersion.java | 52 +- .../http/UnsupportedHttpVersionException.java | 1 - .../java/org/apache/http/annotation/GuardedBy.java | 27 +- .../java/org/apache/http/annotation/Immutable.java | 27 +- .../org/apache/http/annotation/NotThreadSafe.java | 27 +- .../org/apache/http/annotation/ThreadSafe.java | 27 +- .../org/apache/http/concurrent/BasicFuture.java | 11 +- .../org/apache/http/concurrent/FutureCallback.java | 5 +- .../org/apache/http/config/ConnectionConfig.java | 192 ++++ .../main/java/org/apache/http/config/Lookup.java | 15 +- .../org/apache/http/config/MessageConstraints.java | 113 ++ .../Registry.java} | 41 +- .../RegistryBuilder.java} | 41 +- .../java/org/apache/http/config/SocketConfig.java | 197 ++++ .../org/apache/http/entity/AbstractHttpEntity.java | 12 +- .../org/apache/http/entity/BasicHttpEntity.java | 31 +- .../org/apache/http/entity/BufferedHttpEntity.java | 15 +- .../org/apache/http/entity/ByteArrayEntity.java | 17 +- .../apache/http/entity/ContentLengthStrategy.java | 2 +- .../java/org/apache/http/entity/ContentType.java | 136 ++- .../org/apache/http/entity/EntityTemplate.java | 13 +- .../java/org/apache/http/entity/FileEntity.java | 24 +- .../org/apache/http/entity/HttpEntityWrapper.java | 17 +- .../org/apache/http/entity/InputStreamEntity.java | 80 +- .../org/apache/http/entity/SerializableEntity.java | 32 +- .../java/org/apache/http/entity/StringEntity.java | 36 +- .../org/apache/http/impl/BHttpConnectionBase.java | 393 +++++++ .../java/org/apache/http/impl/ConnSupport.java | 75 ++ .../http/impl/DefaultBHttpClientConnection.java | 182 ++++ .../impl/DefaultBHttpClientConnectionFactory.java | 103 ++ .../http/impl/DefaultBHttpServerConnection.java | 174 +++ .../impl/DefaultBHttpServerConnectionFactory.java | 103 ++ .../http/impl/DefaultConnectionReuseStrategy.java | 42 +- .../http/impl/DefaultHttpRequestFactory.java | 13 +- .../http/impl/DefaultHttpResponseFactory.java | 49 +- .../http/impl/EnglishReasonPhraseCatalog.java | 14 +- .../http/impl/HttpConnectionMetricsImpl.java | 10 +- .../http/impl/NoConnectionReuseStrategy.java | 13 +- .../DisallowIdentityContentLengthStrategy.java | 11 +- .../http/impl/entity/LaxContentLengthStrategy.java | 68 +- .../impl/entity/StrictContentLengthStrategy.java | 29 +- .../apache/http/impl/io/AbstractMessageParser.java | 124 ++- .../apache/http/impl/io/AbstractMessageWriter.java | 41 +- .../apache/http/impl/io/ChunkedInputStream.java | 43 +- .../apache/http/impl/io/ChunkedOutputStream.java | 46 +- .../http/impl/io/ContentLengthInputStream.java | 36 +- .../http/impl/io/ContentLengthOutputStream.java | 30 +- .../http/impl/io/DefaultHttpRequestParser.java | 75 +- .../impl/io/DefaultHttpRequestParserFactory.java | 71 ++ ...stWriter.java => DefaultHttpRequestWriter.java} | 28 +- ...r.java => DefaultHttpRequestWriterFactory.java} | 38 +- .../http/impl/io/DefaultHttpResponseParser.java | 75 +- .../impl/io/DefaultHttpResponseParserFactory.java | 71 ++ ...eWriter.java => DefaultHttpResponseWriter.java} | 28 +- ....java => DefaultHttpResponseWriterFactory.java} | 38 +- .../http/impl/io/HttpTransportMetricsImpl.java | 4 +- .../apache/http/impl/io/IdentityInputStream.java | 8 +- .../apache/http/impl/io/IdentityOutputStream.java | 12 +- ...nputBuffer.java => SessionInputBufferImpl.java} | 202 ++-- ...putBuffer.java => SessionOutputBufferImpl.java} | 162 ++- .../apache/http/impl/pool/BasicConnFactory.java | 131 ++- .../org/apache/http/impl/pool/BasicConnPool.java | 45 +- .../org/apache/http/impl/pool/BasicPoolEntry.java | 2 +- .../main/java/org/apache/http/io/EofSensor.java | 3 + .../java/org/apache/http/io/HttpMessageParser.java | 6 +- ...ofSensor.java => HttpMessageParserFactory.java} | 11 +- .../java/org/apache/http/io/HttpMessageWriter.java | 2 +- .../apache/http/io/HttpMessageWriterFactory.java | 17 +- .../org/apache/http/io/SessionInputBuffer.java | 4 + .../apache/http/message/AbstractHttpMessage.java | 40 +- .../java/org/apache/http/message/BasicHeader.java | 8 +- .../apache/http/message/BasicHeaderElement.java | 31 +- .../http/message/BasicHeaderElementIterator.java | 21 +- .../apache/http/message/BasicHeaderIterator.java | 21 +- .../http/message/BasicHeaderValueFormatter.java | 147 ++- .../http/message/BasicHeaderValueParser.java | 170 ++- .../message/BasicHttpEntityEnclosingRequest.java | 2 +- .../org/apache/http/message/BasicHttpRequest.java | 41 +- .../org/apache/http/message/BasicHttpResponse.java | 133 ++- .../apache/http/message/BasicLineFormatter.java | 103 +- .../org/apache/http/message/BasicLineParser.java | 200 ++-- .../http/message/BasicListHeaderIterator.java | 30 +- .../apache/http/message/BasicNameValuePair.java | 28 +- .../org/apache/http/message/BasicRequestLine.java | 22 +- .../org/apache/http/message/BasicStatusLine.java | 18 +- .../apache/http/message/BasicTokenIterator.java | 69 +- .../org/apache/http/message/BufferedHeader.java | 15 +- .../java/org/apache/http/message/HeaderGroup.java | 44 +- .../org/apache/http/message/LineFormatter.java | 2 +- .../java/org/apache/http/message/LineParser.java | 4 +- .../java/org/apache/http/message/ParserCursor.java | 6 +- .../org/apache/http/params/AbstractHttpParams.java | 45 +- .../org/apache/http/params/BasicHttpParams.java | 44 +- .../apache/http/params/CoreConnectionPNames.java | 4 + .../org/apache/http/params/CoreProtocolPNames.java | 10 +- .../org/apache/http/params/HttpParamConfig.java | 78 ++ .../java/org/apache/http/params/HttpParams.java | 9 +- .../org/apache/http/params/HttpParamsNames.java | 4 + .../org/apache/http/pool/AbstractConnPool.java | 210 ++-- .../main/java/org/apache/http/pool/PoolEntry.java | 21 +- .../EofSensor.java => pool/PoolEntryCallback.java} | 14 +- .../java/org/apache/http/pool/PoolEntryFuture.java | 40 +- .../main/java/org/apache/http/pool/PoolStats.java | 36 +- .../org/apache/http/pool/RouteSpecificPool.java | 68 +- .../org/apache/http/protocol/BasicHttpContext.java | 13 +- .../org/apache/http/protocol/ChainBuilder.java | 126 +++ .../main/java/org/apache/http/protocol/HTTP.java | 4 +- .../java/org/apache/http/protocol/HttpContext.java | 11 +- .../org/apache/http/protocol/HttpCoreContext.java | 152 +++ .../apache/http/protocol/HttpDateGenerator.java | 2 +- .../apache/http/protocol/HttpProcessorBuilder.java | 151 +++ .../apache/http/protocol/HttpRequestExecutor.java | 141 +-- ...Resolver.java => HttpRequestHandlerMapper.java} | 19 +- .../http/protocol/HttpRequestHandlerResolver.java | 4 +- .../http/protocol/HttpRequestInterceptorList.java | 3 + .../http/protocol/HttpResponseInterceptorList.java | 3 + .../java/org/apache/http/protocol/HttpService.java | 178 ++- .../http/protocol/ImmutableHttpProcessor.java | 60 +- .../apache/http/protocol/RequestConnControl.java | 7 +- .../org/apache/http/protocol/RequestContent.java | 15 +- .../java/org/apache/http/protocol/RequestDate.java | 10 +- .../http/protocol/RequestExpectContinue.java | 49 +- .../apache/http/protocol/RequestTargetHost.java | 26 +- .../org/apache/http/protocol/RequestUserAgent.java | 37 +- .../apache/http/protocol/ResponseConnControl.java | 24 +- .../org/apache/http/protocol/ResponseContent.java | 19 +- .../org/apache/http/protocol/ResponseDate.java | 10 +- .../org/apache/http/protocol/ResponseServer.java | 30 +- ...istry.java => UriHttpRequestHandlerMapper.java} | 61 +- .../apache/http/protocol/UriPatternMatcher.java | 64 +- .../java/org/apache/http/protocol/package.html | 2 +- .../src/main/java/org/apache/http/util/Args.java | 111 ++ .../main/java/org/apache/http/util/Asserts.java | 48 +- .../java/org/apache/http/util/ByteArrayBuffer.java | 46 +- .../java/org/apache/http/util/CharArrayBuffer.java | 72 +- .../java/org/apache/http/util/CharsetUtils.java | 43 +- .../java/org/apache/http/util/EncodingUtils.java | 63 +- .../java/org/apache/http/util/EntityUtils.java | 85 +- .../main/java/org/apache/http/util/LangUtils.java | 6 +- .../main/java/org/apache/http/util/NetUtils.java | 37 +- .../main/java/org/apache/http/util/TextUtils.java | 31 +- .../java/org/apache/http/util/VersionInfo.java | 111 +- .../resources/org/apache/http/version.properties | 2 +- httpcore/src/site/apt/index.apt | 44 - httpcore/src/site/resources/css/site.css | 1 - httpcore/src/site/site.xml | 40 - .../java/org/apache/http/TestHttpExceptions.java | 2 +- .../test/java/org/apache/http/TestHttpHost.java | 98 +- .../test/java/org/apache/http/TestHttpVersion.java | 26 +- .../apache/http/concurrent/TestBasicFuture.java | 55 +- .../java/org/apache/http/config/TestRegistry.java | 26 +- .../apache/http/entity/TestAbstractHttpEntity.java | 6 +- .../apache/http/entity/TestBasicHttpEntity.java | 28 +- .../apache/http/entity/TestBufferedHttpEntity.java | 30 +- .../apache/http/entity/TestByteArrayEntity.java | 30 +- .../org/apache/http/entity/TestContentType.java | 76 +- .../org/apache/http/entity/TestEntityTemplate.java | 18 +- .../org/apache/http/entity/TestFileEntity.java | 18 +- .../apache/http/entity/TestHttpEntityWrapper.java | 24 +- .../apache/http/entity/TestInputStreamEntity.java | 100 +- .../apache/http/entity/TestSerializableEntity.java | 46 +- .../org/apache/http/entity/TestStringEntity.java | 28 +- .../apache/http/impl/SessionInputBufferMock.java | 76 +- .../apache/http/impl/SessionOutputBufferMock.java | 49 +- .../apache/http/impl/TestBHttpConnectionBase.java | 390 +++++++ .../org/apache/http/impl/TestBasicRequest.java | 17 +- .../impl/TestDefaultBHttpClientConnection.java | 168 +++ .../impl/TestDefaultBHttpServerConnection.java | 188 ++++ .../impl/TestDefaultConnectionReuseStrategy.java | 50 +- .../http/impl/TestEnglishReasonPhraseCatalog.java | 13 +- .../http/impl/TestNoConnectionReuseStrategy.java | 15 +- .../apache/http/impl/entity/DummyHttpMessage.java | 13 +- .../TestDisallowIdentityContentLengthStrategy.java | 12 +- .../http/impl/entity/TestEntityDeserializer.java | 356 ------ .../http/impl/entity/TestEntitySerializer.java | 188 ---- .../impl/entity/TestLaxContentLengthStrategy.java | 118 +- .../entity/TestStrictContentLengthStrategy.java | 35 +- .../org/apache/http/impl/io/TestChunkCoding.java | 195 ++-- .../http/impl/io/TestContentLengthInputStream.java | 60 +- .../impl/io/TestContentLengthOutputStream.java | 30 +- .../http/impl/io/TestIdentityInputStream.java | 31 +- .../http/impl/io/TestIdentityOutputStream.java | 51 +- .../org/apache/http/impl/io/TestMessageParser.java | 55 +- .../org/apache/http/impl/io/TestRequestParser.java | 87 +- .../apache/http/impl/io/TestResponseParser.java | 84 +- ...onBuffers.java => TestSessionInOutBuffers.java} | 410 ++++--- .../http/impl/io/TestSocketOutputBuffer.java | 197 ---- .../http/impl/io/TimeoutByteArrayInputStream.java | 30 +- .../apache/http/impl/pool/TestBasicConnPool.java | 34 +- .../org/apache/http/integration/TestSyncHttp.java | 375 +++---- .../apache/http/message/TestAbstractMessage.java | 46 +- .../message/TestBasicHeaderElementIterator.java | 21 +- .../http/message/TestBasicHeaderIterator.java | 15 +- .../message/TestBasicHeaderValueFormatter.java | 71 +- .../http/message/TestBasicHeaderValueParser.java | 33 +- .../apache/http/message/TestBasicHttpResponse.java | 101 ++ .../http/message/TestBasicLineFormatter.java | 42 +- .../apache/http/message/TestBasicLineParser.java | 42 +- .../org/apache/http/message/TestBasicMessages.java | 33 +- .../http/message/TestBasicTokenIterator.java | 60 +- .../apache/http/message/TestBufferedHeader.java | 34 +- .../java/org/apache/http/message/TestHeader.java | 28 +- .../org/apache/http/message/TestHeaderElement.java | 39 +- .../org/apache/http/message/TestHeaderGroup.java | 92 +- .../org/apache/http/message/TestNameValuePair.java | 24 +- .../org/apache/http/message/TestRequestLine.java | 26 +- .../org/apache/http/message/TestStatusLine.java | 24 +- .../apache/http/params/TestBasicHttpParams.java | 73 -- .../http/params/TestDefaultedHttpParams.java | 98 -- .../java/org/apache/http/pool/TestConnPool.java | 333 +++--- .../java/org/apache/http/pool/TestPoolEntry.java | 27 +- .../apache/http/pool/TestRouteSpecificPool.java | 97 +- .../http/protocol/TestBasicHttpProcessor.java | 127 --- .../org/apache/http/protocol/TestChainBuilder.java | 67 ++ .../http/protocol/TestHttpExecutionContext.java | 14 +- .../http/protocol/TestHttpRequestExecutor.java | 242 ++--- .../protocol/TestHttpRequestHandlerRegistry.java | 244 ----- .../org/apache/http/protocol/TestHttpService.java | 419 ++++--- .../http/protocol/TestStandardInterceptors.java | 682 ++++++------ .../protocol/TestUriHttpRequestHandlerMapper.java | 103 ++ .../http/protocol/TestUriPatternMatcher.java | 155 +++ .../org/apache/http/testserver/HttpClient.java | 63 +- .../org/apache/http/testserver/HttpServer.java | 80 +- .../testserver/LoggingBHttpClientConnection.java | 102 +- .../testserver/LoggingBHttpServerConnection.java | 102 +- .../apache/http/testserver/LoggingInputStream.java | 82 +- .../http/testserver/LoggingOutputStream.java | 38 +- .../java/org/apache/http/testserver}/Wire.java | 41 +- .../test/java/org/apache/http/util/TestArgs.java | 170 +++ .../TestAsserts.java} | 60 +- .../org/apache/http/util/TestByteArrayBuffer.java | 102 +- .../org/apache/http/util/TestCharArrayBuffer.java | 120 +- .../org/apache/http/util/TestEncodingUtils.java | 66 +- .../java/org/apache/http/util/TestEntityUtils.java | 80 +- .../java/org/apache/http/util/TestLangUtils.java | 18 +- pom.xml | 143 +-- src/docbkx/advanced.xml | 283 ++--- src/docbkx/fundamentals.xml | 520 ++++----- src/docbkx/nio-ext.xml | 420 +++---- src/docbkx/preface.xml | 4 +- src/docbkx/resources/css/hc-tutorial.css | 4 +- src/docbkx/resources/xsl/fopdf.xsl | 8 +- src/docbkx/resources/xsl/html.xsl | 4 +- src/docbkx/resources/xsl/html_chunk.xsl | 4 +- src/main/assembly/bin.xml | 85 -- src/main/assembly/build.xml | 70 -- src/main/assembly/osgi-bin.xml | 80 -- src/main/assembly/src.xml | 48 - src/site/apt/download.apt | 66 -- src/site/apt/examples.apt | 62 -- src/site/apt/index.apt | 61 -- src/site/resources/css/site.css | 1 - src/site/site.xml | 45 - 586 files changed, 21787 insertions(+), 23035 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/httpcomponents-core.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
