Skip to content

Fix Persistent Connections (Issue 7230) #1121

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
Bombe wants to merge 3 commits into
base: next
Choose a base branch
from
+54 −5
Open

Fix Persistent Connections (Issue 7230) #1121

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3e79050
✅ Add tests for correct handling of Connection header
Bombe Aug 10, 2026
10fa0cf
✏️ Remove empty line in test
Bombe Aug 10, 2026
4387f1f
✅ Add one more test for correctly processing the Content-Length header
Bombe Aug 10, 2026
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
59 changes: 54 additions & 5 deletions test/freenet/clients/http/ToadletContextImplTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,9 +28,10 @@
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.allOf;
import static org.hamcrest.Matchers.contains;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.empty;
import static org.hamcrest.Matchers.equalTo;
import static org.hamcrest.Matchers.equalToIgnoringCase;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.RETURNS_DEEP_STUBS;
import static org.mockito.Mockito.any;
Expand All @@ -55,7 +56,6 @@ public void requestingHomepageWillReturnHomepage() throws Exception {
assertThat(httpResponses, contains(allOf(
hasStatus(200), hasBody(equalTo("GET OK\n".getBytes(UTF_8)))
)));

});
}

Expand Down Expand Up @@ -187,16 +187,23 @@ public void sendingPostRequestWithoutContentLengthHeaderResultsInHttpStatus400()
});
}

@Test
public void sendingPostRequestWithNegativeContentLengthHeaderResultsInHttpStatus400() throws Exception {
sendRequest("POST /negative-content-length HTTP/1.0\r\nContent-Length: -123\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(hasStatus(equalTo(400), equalTo("Bad Request"))));
});
}

@Test
public void sendingPostRequestWithInvalidContentLengthHeaderResultsInHttpStatus400() throws Exception {
sendRequest("POST /invalid-content-length HTTP/1.1\r\nConnection: Keep-Alive\r\nContent-Length: invalid\r\n\r\n", httpResponses -> {
sendRequest("POST /invalid-content-length HTTP/1.1\r\nContent-Length: invalid\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(hasStatus(equalTo(400), equalTo("Bad Request"))));
});
}

@Test
public void sendingRequestAfterPostRequestWithInvalidContentLengthHeaderResultsInASingleResponseBeingSent() throws Exception {
sendRequest("POST /invalid-content-length HTTP/1.1\r\nConnection: Keep-Alive\r\nContent-Length: invalid\r\n\r\nGET / HTTP/1.0\r\n\r\n", httpResponses -> {
sendRequest("POST /invalid-content-length HTTP/1.1\r\nContent-Length: invalid\r\n\r\nGET / HTTP/1.0\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(hasStatus(equalTo(400), equalTo("Bad Request"))));
});
}
Expand Down Expand Up @@ -317,14 +324,56 @@ public void pipeliningAPutAndAGetRequestResultsInTwoSuccessfulRequests() throws
postToadlet.allowPostWithoutPassword();
when(toadletContainer.findToadlet(new URI("/post-request"))).thenReturn(postToadlet);
when(toadletContainer.findToadlet(new URI("/get-request"))).thenReturn(homepageToadlet);
sendRequest("POST /post-request HTTP/1.1\r\nContent-Length: 0\r\n\r\nGET /get-request HTTP/1.1\r\nConnection: close\r\n\r\n", httpResponses -> {
sendRequest("POST /post-request HTTP/1.1\r\nContent-Length: 0\r\n\r\nGET /get-request HTTP/1.1\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(
allOf(hasStatus(200), hasBody(equalTo("POST OK\n".getBytes(UTF_8)))),
allOf(hasStatus(200), hasBody(equalTo("GET OK\n".getBytes(UTF_8))))
));
});
}

@Test
public void requestingConnectionCloseWillReplyWithConnectionCloseWhenPipeliningIsNotAllowed() throws Exception {
when(toadletContainer.findToadlet(URI.create("/requesting-connection-close"))).thenReturn(homepageToadlet);
sendRequest("GET /requesting-connection-close HTTP/1.1\r\nConnection: close\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(
hasHeader("Connection", contains(equalToIgnoringCase("close")))
));
});
}

@Test
public void requestingConnectionKeepAliveWillReplyWithConnectionCloseWhenPipeliningIsNotAllowed() throws Exception {
when(toadletContainer.findToadlet(URI.create("/requesting-connection-keep-alive"))).thenReturn(homepageToadlet);
sendRequest("GET /requesting-connection-keep-alive HTTP/1.1\r\nConnection: keep-alive\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(
hasHeader("Connection", contains(equalToIgnoringCase("close")))
));
});
}

@Test
public void requestingConnectionCloseWillReplyWithConnectionCloseWhenPipeliningIsAllowed() throws Exception {
when(toadletContainer.enablePersistentConnections()).thenReturn(true);
when(toadletContainer.findToadlet(URI.create("/requesting-connection-close"))).thenReturn(homepageToadlet);
sendRequest("GET /requesting-connection-close HTTP/1.1\r\nConnection: close\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(
hasHeader("Connection", contains(equalToIgnoringCase("close")))
));
});
}

@Test
public void requestingConnectionKeepAliveWillReplyWithConnectionKeepAliveWhenPipeliningIsAllowed() throws Exception {
when(toadletContainer.enablePersistentConnections()).thenReturn(true);
when(toadletContainer.findToadlet(URI.create("/requesting-connection-keep-alive"))).thenReturn(homepageToadlet);
sendRequest("GET /requesting-connection-keep-alive HTTP/1.1\r\nConnection: keep-alive\r\n\r\n", httpResponses -> {
assertThat(httpResponses, contains(
hasHeader("Connection", contains(equalToIgnoringCase("keep-alive")))
));
});
}

@Test
public void ioExceptionInGetMethodOfToadletWillCauseHttpStatus500() throws Exception {
when(toadletContainer.findToadlet(new URI("/error-in-get"))).thenReturn(errorToadlet);
Expand Down