Even more downstream respect

Tim-Brooks · Sep 6, 2024 · c0767ee · c0767ee
1 parent 280cddc
commit c0767ee
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/...ansport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpHeaderValidator.java b/...ansport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpHeaderValidator.java
@@ -60,7 +60,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception
                 pending.add(ReferenceCountUtil.retain(httpObject));
                 requestStart(ctx);
                 assert state == QUEUEING_DATA;
-                ctx.channel().config().setAutoRead(false);
+                assert ctx.channel().config().isAutoRead() == false;
                 break;
             case QUEUEING_DATA:
                 pending.add(ReferenceCountUtil.retain(httpObject));
@@ -105,6 +105,7 @@ private void requestStart(ChannelHandlerContext ctx) {
         }
 
         state = QUEUEING_DATA;
+        ctx.channel().config().setAutoRead(false);
 
         if (httpRequest == null) {
             // this looks like a malformed request and will forward without validation
@@ -150,6 +151,7 @@ private void forwardFullRequest(ChannelHandlerContext ctx) {
         assert ctx.channel().config().isAutoRead() == false;
         assert state == QUEUEING_DATA;
 
+        ctx.channel().config().setAutoRead(true);
         boolean fullRequestForwarded = forwardData(ctx, pending);
 
         assert fullRequestForwarded || pending.isEmpty();
@@ -161,7 +163,6 @@ private void forwardFullRequest(ChannelHandlerContext ctx) {
         }
 
         assert state == WAITING_TO_START || state == QUEUEING_DATA || state == FORWARDING_DATA_UNTIL_NEXT_REQUEST;
-        ctx.channel().config().setAutoRead(state != QUEUEING_DATA);
     }
 
     private void forwardRequestWithDecoderExceptionAndNoContent(ChannelHandlerContext ctx, Exception e) {
@@ -177,6 +178,8 @@ private void forwardRequestWithDecoderExceptionAndNoContent(ChannelHandlerContex
             messageToForward = toReplace.replace(Unpooled.EMPTY_BUFFER);
         }
         messageToForward.setDecoderResult(DecoderResult.failure(e));
+
+        ctx.channel().config().setAutoRead(true);
         ctx.fireChannelRead(messageToForward);
 
         assert fullRequestDropped || pending.isEmpty();
@@ -188,7 +191,6 @@ private void forwardRequestWithDecoderExceptionAndNoContent(ChannelHandlerContex
         }
 
         assert state == WAITING_TO_START || state == QUEUEING_DATA || state == DROPPING_DATA_UNTIL_NEXT_REQUEST;
-        ctx.channel().config().setAutoRead(state != QUEUEING_DATA);
     }
 
     @Override