Skip to content

[UNDERTOW-2575] Add flush before socket close on write timeout #1747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[UNDERTOW-2575] Add flush before socket close on write timeout #1747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions core/src/main/java/io/undertow/conduits/WriteTimeoutStreamSinkConduit.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,15 @@ private void handleWriteTimeout(final long ret) throws IOException {
long expireTimeVar = expireTime;
if (expireTimeVar != -1 && currentTime > expireTimeVar) {
this.expireTime = -1;
//shutdown write will call AbstractFramedStreamSinkConduit#queueCloseFrames. In some cases it will schedule
//additional packets to adhere to protocol, we need to flush content( this would happen later, if not for
//subsequent close
connection.getSinkChannel().shutdownWrites();
try {
connection.getSinkChannel().flush();
} catch(IOException e) {
UndertowLogger.REQUEST_LOGGER.ioException(e);
}
IoUtils.safeClose(connection);
throw new ClosedChannelException();
}
Expand Down
Loading