Skip to content

Timeout test #411

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 3 commits into
base: master
Choose a base branch
from
Open

Timeout test #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
515db81
*连接未关闭
Jun 5, 2018
0d3b91f
disconnect when connect server error and lastReadTime == 0
Jun 5, 2018
62dedeb
return BAD_GATEWAY when connect server error and lastReadTime ==0
Jun 5, 2018
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
4 changes: 3 additions & 1 deletion src/main/java/org/littleshoot/proxy/impl/ClientToProxyConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -528,7 +528,9 @@ void timedOut(ProxyToServerConnection serverConnection) {
@Override
protected void timedOut() {
// idle timeout fired on the client channel. if we aren't waiting on a response from a server, hang up
if (currentServerConnection == null || this.lastReadTime <= currentServerConnection.lastReadTime) {
// fix : disconnect when connect server error and lastReadTime == 0
if (currentServerConnection == null || this.lastReadTime <= currentServerConnection.lastReadTime
|| currentServerConnection.lastReadTime == 0 && currentServerConnection.is(ConnectionState.DISCONNECTED)) {
super.timedOut();
}
}
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/org/littleshoot/proxy/impl/ProxyToServerConnection.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,16 @@ protected void disconnected() {
}
}
clientConnection.serverDisconnected(this);
// fix : return BAD_GATEWAY when connect server error and lastReadTime ==0
if (serverConnection.lastReadTime == 0) {
FullHttpResponse substituteResponse = ProxyUtils.createFullHttpResponse(HttpVersion.HTTP_1_1,
HttpResponseStatus.BAD_GATEWAY,
"Unable to parse response from server");
HttpHeaders.setKeepAlive(substituteResponse, false);
HttpResponse httpResponse = substituteResponse;
rememberCurrentResponse(httpResponse);
respondWith(httpResponse);
}
}

@Override
Expand Down