Skip to content

Commit 7e1085a

Browse files
committed
MonitoringResponseOutOfOrderStrategy: Always perform a blocking read to check for data
1 parent e64051c commit 7e1085a

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

httpcore5-testing/src/test/java/org/apache/hc/core5/testing/classic/MonitoringResponseOutOfOrderStrategyIntegrationTest.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,7 @@ public MonitoringResponseOutOfOrderStrategyIntegrationTest(final URIScheme schem
7878
.setSocketConfig(SocketConfig.custom()
7979
.setSoTimeout(TIMEOUT)
8080
.setSoKeepAlive(false)
81+
.setTcpNoDelay(true)
8182
.build())
8283
.setRequestRouter(RequestRouter.<HttpRequestHandler>builder()
8384
.addRoute(RequestRouter.LOCAL_AUTHORITY, "*", (request, response, context) -> {

httpcore5/src/main/java/org/apache/hc/core5/http/impl/io/MonitoringResponseOutOfOrderStrategy.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,7 @@ public boolean isEarlyResponseDetected(
9292
final long totalBytesSent,
9393
final long nextWriteSize) throws IOException {
9494
if (nextWriteStartsNewChunk(totalBytesSent, nextWriteSize)) {
95-
final boolean ssl = connection.getSSLSession() != null;
96-
return ssl ? connection.isDataAvailable(Timeout.ONE_MILLISECOND) : (inputStream.available() > 0);
95+
return connection.isDataAvailable(Timeout.ONE_MILLISECOND);
9796
}
9897
return false;
9998
}

0 commit comments

Comments
 (0)