Skip to content

fix(#22) #23

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

Merged
alalag1 merged 2 commits into from
Nov 26, 2021
Merged

fix(#22) #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c5ee306
fix(#22)
Nov 26, 2021
78360d0
fix(#22)
Nov 26, 2021
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
9 changes: 9 additions & 0 deletions httpserver/src/main/java/io/esastack/httpserver/impl/Http1Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@
import io.netty.handler.codec.http.DefaultFullHttpResponse;
import io.netty.handler.codec.http.FullHttpResponse;
import io.netty.handler.codec.http.HttpContent;
import io.netty.handler.codec.http.HttpExpectationFailedEvent;
import io.netty.handler.codec.http.HttpHeaderValues;
import io.netty.handler.codec.http.HttpMessage;
import io.netty.handler.codec.http.HttpObject;
Expand Down Expand Up @@ -409,6 +410,10 @@ private void write413(ChannelHandlerContext ctx, boolean keepalive, FullHttpResp
ctx.channel().close();
}
});
// fix https://github.com/esastack/esa-httpserver/issues/22
// we must trigger this event to make sure HttpObjectDecoder#reset() is invoked.
// see more details from HttpObjectDecoder#userEventTriggered()
ctx.pipeline().fireUserEventTriggered(HttpExpectationFailedEvent.INSTANCE);
}

private void write417(ChannelHandlerContext ctx, boolean keepalive) {
Expand All @@ -421,6 +426,10 @@ private void write417(ChannelHandlerContext ctx, boolean keepalive) {
ctx.channel().close();
}
});
// fix https://github.com/esastack/esa-httpserver/issues/22
// we must trigger this event to make sure HttpObjectDecoder#reset() is invoked.
// see more details from HttpObjectDecoder#userEventTriggered()
ctx.pipeline().fireUserEventTriggered(HttpExpectationFailedEvent.INSTANCE);
}

private void write400(ChannelHandlerContext ctx, DecoderResult msg) {
Expand Down
4 changes: 4 additions & 0 deletions httpserver/src/main/java/io/esastack/httpserver/impl/Http2Handler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -420,6 +420,8 @@ private void write413(ChannelHandlerContext ctx,
stream.close();
} else if (isShutdown() && ctx.channel().isActive()) {
ctx.channel().close();
} else {
stream.close();
}
});
}
Expand All @@ -445,6 +447,8 @@ private void write417(ChannelHandlerContext ctx,
stream.close();
} else if (isShutdown() && ctx.channel().isActive()) {
ctx.channel().close();
} else {
stream.close();
}
});
}
Expand Down
4 changes: 0 additions & 4 deletions httpserver/src/main/java/io/esastack/httpserver/impl/Http2HeadersImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,4 @@ final class Http2HeadersImpl extends Http2HeadersAdaptor {
Http2HeadersImpl(Http2Headers headers) {
super(headers);
}

Http2Headers unwrap() {
return underlying;
}
}