Dang, please accept my apologies. Gary
On Sat, Jun 29, 2024, 9:32 AM Oleg Kalnichevski <o...@ok2consulting.com.invalid> wrote: > Your merge has wiped out one of the refactoring commits. Please always > re-base instead of merging. > > I will fix the branch shortly. > > Oleg > > > On Sat, 2024-06-29 at 13:20 +0000, ggreg...@apache.org wrote: > > This is an automated email from the ASF dual-hosted git repository. > > > > ggregory pushed a commit to branch master > > in repository > > https://gitbox.apache.org/repos/asf/httpcomponents-core.git > > > > commit 7b6ee43deda9d5e39f7bbcbe23df2ea6d531e465 > > Merge: f960090d5 63fe8d6ce > > Author: Gary Gregory <garydgreg...@gmail.com> > > AuthorDate: Sat Jun 29 09:10:41 2024 -0400 > > > > Merge branch 'master' of > > https://gitbox.apache.org/repos/asf/httpcomponents-core.git > > > > httpcore5-h2/pom.xml | 2 +- > > .../apache/hc/core5/http2/config/H2ConfigTest.java | 2 +- > > .../core5/http2/frame/TestDefaultFrameFactory.java | 10 +- > > .../apache/hc/core5/http2/frame/TestFrameFlag.java | 4 +- > > .../hc/core5/http2/frame/TestH2Settings.java | 6 +- > > .../hc/core5/http2/hpack/TestFifoBuffer.java | 6 +- > > .../hc/core5/http2/hpack/TestFifoLinkedList.java | 6 +- > > .../hc/core5/http2/hpack/TestHPackCoding.java | 75 ++++---- > > .../core5/http2/hpack/TestInboundDynamicTable.java | 6 +- > > .../http2/hpack/TestOutboundDynamicTable.java | 6 +- > > .../http2/impl/TestDefaultH2RequestConverter.java | 74 ++++---- > > .../http2/impl/TestDefaultH2ResponseConverter.java | 30 ++-- > > .../core5/http2/impl/io/TestFrameInOutBuffers.java | 20 +-- > > .../impl/nio/TestAbstractH2StreamMultiplexer.java | 8 +- > > .../http2/impl/nio/TestFrameInOutBuffers.java | 24 +-- > > .../core5/http2/protocol/TestH2Interceptors.java | 16 +- > > .../http2/ssl/ConscryptClientTlsStrategyTest.java | 2 +- > > httpcore5-reactive/pom.xml | 2 +- > > .../core5/reactive/TestReactiveDataConsumer.java | 18 +- > > .../core5/reactive/TestReactiveDataProducer.java | 6 +- > > .../core5/reactive/TestReactiveEntityProducer.java | 6 +- > > httpcore5-testing/pom.xml | 4 +- > > .../core5/testing/classic/ClassicTestClient.java | 36 +++- > > .../core5/testing/classic/ClassicTestServer.java | 85 ++++++--- > > .../framework/ClassicTestClientAdapter.java | 2 +- > > .../apache/hc/core5/testing/nio/H2TestClient.java | 124 ++++++++++- > > -- > > .../apache/hc/core5/testing/nio/H2TestServer.java | 149 > > ++++++++++++---- > > .../hc/core5/testing/nio/Http1TestClient.java | 55 ++++-- > > .../hc/core5/testing/nio/Http1TestServer.java | 63 ++++++- > > .../hc/core5/benchmark/BenchmarkToolTest.java | 8 +- > > .../hc/core5/benchmark/ResultFormatterTest.java | 4 +- > > .../testing/classic/ClassicAuthenticationTest.java | 12 +- > > .../classic/ClassicHttp1CoreTransportTest.java | 6 +- > > .../ClassicHttp1SocksProxyCoreTransportTest.java | 6 +- > > .../classic/ClassicHttpCoreTransportTest.java | 8 +- > > .../testing/classic/ClassicIntegrationTest.java | 60 +++---- > > .../testing/classic/ClassicIntegrationTests.java | 20 +-- > > .../testing/classic/ClassicProtocolTests.java | 6 +- > > .../classic/ClassicServerBootstrapFilterTest.java | 8 +- > > .../testing/classic/ClassicTLSIntegrationTest.java | 18 +- > > ...gResponseOutOfOrderStrategyIntegrationTest.java | 8 +- > > .../compatibility/http2/H2CompatibilityTest.java | 6 +- > > .../testing/compatibility/http2/HttpBinIT.java | 8 +- > > .../classic}/ClassicTestResources.java | 2 +- > > .../classic}/HttpRequesterResource.java | 2 +- > > .../classic}/HttpServerResource.java | 2 +- > > .../nio}/H2AsyncRequesterResource.java | 2 +- > > .../nio}/H2AsyncServerResource.java | 5 +- > > .../nio}/H2MultiplexingRequesterResource.java | 2 +- > > .../nio}/H2TestResources.java | 2 +- > > .../nio}/Http1TestResources.java | 2 +- > > .../nio}/HttpAsyncRequesterResource.java | 2 +- > > .../nio}/HttpAsyncServerResource.java | 5 +- > > .../TestClassicTestClientTestingAdapter.java | 32 ++-- > > .../testing/framework/TestClientPojoAdapter.java | 8 +- > > .../framework/TestClientTestingAdapter.java | 6 +- > > .../core5/testing/framework/TestFrameworkTest.java | 10 +- > > .../testing/framework/TestTestingFramework.java | 68 +++---- > > .../TestTestingFrameworkRequestHandler.java | 6 +- > > .../nio/AsyncServerBootstrapFilterTest.java | 10 +- > > .../apache/hc/core5/testing/nio/H2AlpnTest.java | 8 +- > > .../apache/hc/core5/testing/nio/H2AlpnTests.java | 12 +- > > .../hc/core5/testing/nio/H2ConnPoolTest.java | 15 +- > > .../nio/H2CoreTransportMultiplexingTest.java | 14 +- > > .../hc/core5/testing/nio/H2CoreTransportTest.java | 6 +- > > .../hc/core5/testing/nio/H2IntegrationTest.java | 106 +++++++---- > > .../testing/nio/H2ProtocolNegotiationTest.java | 12 +- > > .../testing/nio/H2ServerBootstrapFiltersTest.java | 10 +- > > .../testing/nio/H2SocksProxyCoreTransportTest.java | 6 +- > > .../core5/testing/nio/Http1AuthenticationTest.java | 12 +- > > .../core5/testing/nio/Http1CoreTransportTest.java | 8 +- > > .../hc/core5/testing/nio/Http1IntegrationTest.java | 125 +++++++---- > > -- > > .../nio/Http1SocksProxyCoreTransportTest.java | 6 +- > > .../core5/testing/nio/HttpCoreTransportTest.java | 12 +- > > .../hc/core5/testing/nio/HttpIntegrationTests.java | 30 ++-- > > .../hc/core5/testing/nio/HttpProtocolTests.java | 10 +- > > .../testing/nio/JSSEProviderIntegrationTest.java | 21 ++- > > .../testing/nio/JSSEProviderIntegrationTests.java | 8 +- > > .../hc/core5/testing/nio/TLSIntegrationTest.java | 16 +- > > .../hc/core5/testing/nio/TLSUpgradeTest.java | 8 +- > > .../testing/nio/TestDefaultListeningIOReactor.java | 10 +- > > .../core5/testing/reactive/IntegrationTests.java | 6 +- > > .../core5/testing/reactive/ReactiveClientTest.java | 18 +- > > httpcore5/pom.xml | 2 +- > > .../core5/http/impl/bootstrap/HttpRequester.java | 23 ++- > > .../core5/http/impl/bootstrap/RequestListener.java | 12 +- > > .../hc/core5/annotation/ThreadingBehaviorTest.java | 2 +- > > .../core5/concurrent/DefaultThreadFactoryTest.java | 4 +- > > .../hc/core5/concurrent/TestBasicFuture.java | 22 +-- > > .../hc/core5/concurrent/TestCompletedFuture.java | 4 +- > > .../core5/concurrent/TestComplexCancellable.java | 4 +- > > .../hc/core5/concurrent/TestComplexFuture.java | 10 +- > > .../org/apache/hc/core5/http/TestContentType.java | 26 +-- > > .../apache/hc/core5/http/TestHttpExceptions.java | 40 ++--- > > .../org/apache/hc/core5/http/TestHttpHost.java | 46 ++--- > > .../org/apache/hc/core5/http/TestHttpVersion.java | 32 ++-- > > .../apache/hc/core5/http/TestProtocolVersion.java | 10 +- > > .../hc/core5/http/TestProtocolVersionParser.java | 12 +- > > .../core5/http/config/TestNamedElementChain.java | 8 +- > > .../apache/hc/core5/http/config/TestRegistry.java | 4 +- > > .../core5/http/impl/IncomingEntityDetailsTest.java | 12 +- > > .../impl/TestDefaultConnectionReuseStrategy.java | 62 +++---- > > .../impl/TestDefaultContentLengthStrategy.java | 24 +-- > > .../http/impl/TestEnglishReasonPhraseCatalog.java | 8 +- > > .../http/impl/io/TestBHttpConnectionBase.java | 42 ++--- > > .../hc/core5/http/impl/io/TestChunkCoding.java | 54 +++--- > > .../http/impl/io/TestContentLengthInputStream.java | 14 +- > > .../impl/io/TestContentLengthOutputStream.java | 6 +- > > .../impl/io/TestDefaultBHttpClientConnection.java | 34 ++-- > > .../impl/io/TestDefaultBHttpServerConnection.java | 28 +-- > > .../http/impl/io/TestHttpRequestExecutor.java | 26 +-- > > .../hc/core5/http/impl/io/TestHttpService.java | 24 +-- > > .../http/impl/io/TestIdentityInputStream.java | 10 +- > > .../http/impl/io/TestIdentityOutputStream.java | 10 +- > > .../hc/core5/http/impl/io/TestMessageParser.java | 16 +- > > .../TestMonitoringResponseOutOfOrderStrategy.java | 12 +- > > .../hc/core5/http/impl/io/TestRequestParser.java | 12 +- > > .../hc/core5/http/impl/io/TestResponseParser.java | 12 +- > > .../http/impl/io/TestSessionInOutBuffers.java | 44 ++--- > > ...tAbstractHttp1StreamDuplexerCapacityWindow.java | 18 +- > > .../hc/core5/http/impl/nio/TestChunkDecoder.java | 44 ++--- > > .../hc/core5/http/impl/nio/TestChunkEncoder.java | 24 +-- > > .../core5/http/impl/nio/TestExpandableBuffer.java | 6 +- > > .../core5/http/impl/nio/TestIdentityDecoder.java | 22 +-- > > .../core5/http/impl/nio/TestIdentityEncoder.java | 76 +++----- > > .../http/impl/nio/TestLengthDelimitedDecoder.java | 36 ++-- > > .../http/impl/nio/TestLengthDelimitedEncoder.java | 54 +++--- > > .../http/impl/nio/TestSessionInOutBuffers.java | 48 ++--- > > .../http/impl/routing/TestPathPatternMatcher.java | 6 +- > > .../core5/http/impl/routing/TestRequestRouter.java | 10 +- > > .../core5/http/impl/routing/TestUriPathRouter.java | 22 +-- > > .../hc/core5/http/io/TestEofSensorInputStream.java | 37 ++-- > > .../core5/http/io/entity/TestBasicHttpEntity.java | 10 +- > > .../http/io/entity/TestBufferedHttpEntity.java | 12 +- > > .../core5/http/io/entity/TestByteArrayEntity.java | 18 +- > > .../core5/http/io/entity/TestByteBufferEntity.java | 6 +- > > .../hc/core5/http/io/entity/TestEntityUtils.java | 38 ++-- > > .../hc/core5/http/io/entity/TestFileEntity.java | 8 +- > > .../http/io/entity/TestHttpEntityWrapper.java | 12 +- > > .../http/io/entity/TestInputStreamEntity.java | 16 +- > > .../hc/core5/http/io/entity/TestNullEntity.java | 18 +- > > .../hc/core5/http/io/entity/TestPathEntity.java | 8 +- > > .../http/io/entity/TestSerializableEntity.java | 6 +- > > .../hc/core5/http/io/entity/TestStringEntity.java | 12 +- > > .../http/io/support/ClassicRequestBuilderTest.java | 22 +-- > > .../io/support/ClassicResponseBuilderTest.java | 2 +- > > .../core5/http/message/HttpRequestWrapperTest.java | 22 +-- > > .../http/message/HttpResponseWrapperTest.java | 3 +- > > .../hc/core5/http/message/TestBasicHeader.java | 8 +- > > .../message/TestBasicHeaderElementIterator.java | 8 +- > > .../http/message/TestBasicHeaderIterator.java | 12 +- > > .../message/TestBasicHeaderValueFormatter.java | 14 +- > > .../http/message/TestBasicHeaderValueParser.java | 20 +-- > > .../core5/http/message/TestBasicLineFormatter.java | 20 +-- > > .../hc/core5/http/message/TestBasicLineParser.java | 20 +-- > > .../hc/core5/http/message/TestBasicMessages.java | 37 ++-- > > .../hc/core5/http/message/TestBasicStatusLine.java | 6 +- > > .../core5/http/message/TestBasicTokenIterator.java | 58 +++--- > > .../hc/core5/http/message/TestBufferedHeader.java | 10 +- > > .../apache/hc/core5/http/message/TestHeader.java | 14 +- > > .../hc/core5/http/message/TestHeaderElement.java | 24 ++- > > .../hc/core5/http/message/TestHeaderGroup.java | 26 +-- > > .../hc/core5/http/message/TestMessageSupport.java | 46 ++--- > > .../hc/core5/http/message/TestNameValuePair.java | 30 ++-- > > .../entity/TestAbstractBinAsyncEntityConsumer.java | 4 +- > > .../entity/TestAbstractBinAsyncEntityProducer.java | 8 +- > > .../TestAbstractCharAsyncEntityConsumer.java | 6 +- > > .../TestAbstractCharAsyncEntityProducer.java | 6 +- > > .../http/nio/entity/TestAsyncEntityProducers.java | 6 +- > > .../nio/entity/TestBasicAsyncEntityProducer.java | 10 +- > > .../nio/entity/TestDigestingEntityConsumer.java | 4 +- > > .../nio/entity/TestDigestingEntityProducer.java | 4 +- > > .../nio/entity/TestFileAsyncEntityProducer.java | 10 +- > > .../http/nio/entity/TestFileEntityProducer.java | 4 +- > > .../nio/entity/TestPathAsyncEntityProducer.java | 10 +- > > .../http/nio/entity/TestPathEntityProducer.java | 4 +- > > .../nio/entity/TestStringAsyncEntityProducer.java | 6 +- > > .../http/nio/ssl/BasicClientTlsStrategyTest.java | 2 +- > > .../http/nio/ssl/BasicServerTlsStrategyTest.java | 2 +- > > .../nio/support/classic/TestSharedInputBuffer.java | 12 +- > > .../support/classic/TestSharedOutputBuffer.java | 12 +- > > .../hc/core5/http/protocol/TestChainBuilder.java | 4 +- > > ...ardedRequest.java => TestForwardedRequest.java} | 14 +- > > .../http/protocol/TestHttpExecutionContext.java | 6 +- > > .../http/protocol/TestStandardInterceptors.java | 196 ++++++++++- > > ---------- > > .../hc/core5/http/protocol/ViaRequestTest.java | 22 +-- > > .../java/org/apache/hc/core5/http/ssl/TLSTest.java | 6 +- > > .../apache/hc/core5/http/ssl/TestTlsCiphers.java | 6 +- > > .../http/support/TestBasicMessageBuilders.java | 10 +- > > .../hc/core5/http/support/TestExpectSupport.java | 16 +- > > .../java/org/apache/hc/core5/net/TestHost.java | 28 +-- > > .../apache/hc/core5/net/TestInetAddressUtils.java | 22 +-- > > .../org/apache/hc/core5/net/TestPercentCodec.java | 12 +- > > .../org/apache/hc/core5/net/TestURIAuthority.java | 26 +-- > > .../org/apache/hc/core5/net/TestURIBuilder.java | 162 ++++++++--- > > ------ > > .../org/apache/hc/core5/net/TestWWWFormCodec.java | 6 +- > > .../org/apache/hc/core5/pool/TestLaxConnPool.java | 36 ++-- > > .../org/apache/hc/core5/pool/TestPoolEntry.java | 16 +- > > .../apache/hc/core5/pool/TestStrictConnPool.java | 42 ++--- > > .../hc/core5/reactor/IOReactorConfigTest.java | 4 +- > > .../org/apache/hc/core5/reactor/IOWorkersTest.java | 4 +- > > .../core5/reactor/TestAbstractIOSessionPool.java | 20 +-- > > .../hc/core5/reactor/ssl/SSLIOSessionTest.java | 2 +- > > .../org/apache/hc/core5/ssl/SSLContextsTest.java | 2 +- > > .../apache/hc/core5/ssl/TestSSLContextBuilder.java | 58 +++--- > > .../java/org/apache/hc/core5/util/TestArgs.java | 84 ++++----- > > .../java/org/apache/hc/core5/util/TestAsserts.java | 18 +- > > .../apache/hc/core5/util/TestByteArrayBuffer.java | 44 ++--- > > .../apache/hc/core5/util/TestCharArrayBuffer.java | 48 ++--- > > .../org/apache/hc/core5/util/TestDeadline.java | 24 +-- > > .../core5/util/TestDeadlineTimeoutException.java | 6 +- > > .../org/apache/hc/core5/util/TestLangUtils.java | 10 +- > > .../org/apache/hc/core5/util/TestTextUtils.java | 10 +- > > .../org/apache/hc/core5/util/TestTimeValue.java | 46 ++--- > > .../java/org/apache/hc/core5/util/TestTimeout.java | 34 ++-- > > .../hc/core5/util/TestTimeoutValueException.java | 4 +- > > .../org/apache/hc/core5/util/TestTokenizer.java | 24 +-- > > pom.xml | 6 +- > > 218 files changed, 2430 insertions(+), 2108 deletions(-) > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@hc.apache.org > For additional commands, e-mail: dev-h...@hc.apache.org > >
