[UNDERTOW-2241] At WriteTimeoutStreamSinkConduit, shutdown writes bef…

…ore closing the connection to give a chance to outer channels wrap up. At ChunkedStreamSinkConduit create the last chunk and attempt to flush before truncating writes. Signed-off-by: Flavia Rainone <frainone@redhat.com>
undertow-io · Mar 24, 2023 · 03b4de4 · 03b4de4
1 parent 03ccaa0
commit 03b4de4
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 4 deletions.
diff --git a/core/src/main/java/io/undertow/conduits/ChunkedStreamSinkConduit.java b/core/src/main/java/io/undertow/conduits/ChunkedStreamSinkConduit.java
@@ -301,23 +301,35 @@ public void terminateWrites() throws IOException {
         if(anyAreSet(state, FLAG_WRITES_SHUTDOWN)) {
             return;
         }
-        if (this.chunkleft != 0) {
-            UndertowLogger.REQUEST_IO_LOGGER.debugf("Channel closed mid-chunk");
-            next.truncateWrites();
-        }
         if (!anyAreSet(state, FLAG_FIRST_DATA_WRITTEN)) {
             //if no data was actually sent we just remove the transfer encoding header, and set content length 0
             //TODO: is this the best way to do it?
             //todo: should we make this behaviour configurable?
             responseHeaders.put(Headers.CONTENT_LENGTH, "0"); //according to the spec we don't actually need this, but better to be safe
             responseHeaders.remove(Headers.TRANSFER_ENCODING);
             state |= FLAG_NEXT_SHUTDOWN | FLAG_WRITES_SHUTDOWN;
+            try {
+                flush();
+            } catch (IOException ignore) {
+                // just log it at debug level, this is nothing but an attempt to flush the last bytes
+                UndertowLogger.REQUEST_IO_LOGGER.ioException(ignore);
+            }
             if(anyAreSet(state, CONF_FLAG_PASS_CLOSE)) {
                 next.terminateWrites();
             }
         } else {
             createLastChunk(false);
             state |= FLAG_WRITES_SHUTDOWN;
+            try {
+                flush();
+            } catch (IOException ignore) {
+                // just log it at debug level, this is nothing but an attempt to flush the last bytes
+                UndertowLogger.REQUEST_IO_LOGGER.ioException(ignore);
+            }
+        }
+        if (this.chunkleft != 0) {
+            UndertowLogger.REQUEST_IO_LOGGER.debugf("Channel closed mid-chunk");
+            next.truncateWrites();
         }
     }
 

diff --git a/core/src/main/java/io/undertow/conduits/WriteTimeoutStreamSinkConduit.java b/core/src/main/java/io/undertow/conduits/WriteTimeoutStreamSinkConduit.java
@@ -99,6 +99,7 @@ private void handleWriteTimeout(final long ret) throws IOException {
         long expireTimeVar = expireTime;
         if (expireTimeVar != -1 && currentTime > expireTimeVar) {
             this.expireTime = -1;
+            connection.getSinkChannel().shutdownWrites();
             IoUtils.safeClose(connection);
             throw new ClosedChannelException();
         }