Skip to content

8358942: HttpClient adds Content-Length: 0 for a GET request with a BodyPublishers.noBody() #27727

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

Closed
wants to merge 5 commits into from
Closed

8358942: HttpClient adds Content-Length: 0 for a GET request with a BodyPublishers.noBody() #27727

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
11892a7
Do not send content-length if body is empty and the method doesn't ex…
djelinski Oct 9, 2025
fc6a7ed
Add test explicitly setting content length to zero
djelinski Oct 10, 2025
da849bf
Check that content-length is sent on POST/PUT with empty body
djelinski Oct 14, 2025
76dc259
More strict verification of content-length handling
djelinski Oct 14, 2025
a2d13e4
Remove leftover check
djelinski Oct 14, 2025
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
11 changes: 8 additions & 3 deletions src/java.net.http/share/classes/jdk/internal/net/http/Http1Request.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,7 +290,8 @@ List<ByteBuffer> headers() {
}
String uriString = requestURI();
StringBuilder sb = new StringBuilder(64);
sb.append(request.method())
String method = request.method();
sb.append(method)
.append(' ')
.append(uriString)
.append(" HTTP/1.1\r\n");
Expand All @@ -300,11 +301,15 @@ List<ByteBuffer> headers() {
systemHeadersBuilder.setHeader("Host", hostString());
}

// GET, HEAD and DELETE with no request body should not set the Content-Length header
if (requestPublisher != null) {
contentLength = requestPublisher.contentLength();
if (contentLength == 0) {
systemHeadersBuilder.setHeader("Content-Length", "0");
// PUT and POST with no request body should set the Content-Length header
// even when the content is empty.
// Other methods defined in RFC 9110 should not send the header in that case.
if ("POST".equals(method) || "PUT".equals(method)) {
systemHeadersBuilder.setHeader("Content-Length", "0");
}
} else if (contentLength > 0) {
systemHeadersBuilder.setHeader("Content-Length", Long.toString(contentLength));
streaming = false;
Expand Down
154 changes: 128 additions & 26 deletions test/jdk/java/net/httpclient/ContentLengthHeaderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@
* @library /test/lib /test/jdk/java/net/httpclient/lib
* @build jdk.test.lib.net.SimpleSSLContext
* jdk.httpclient.test.lib.common.HttpServerAdapters
* @bug 8283544
* @bug 8283544 8358942
* @run testng/othervm
* -Djdk.httpclient.allowRestrictedHeaders=content-length
* -Djdk.internal.httpclient.debug=true
* ContentLengthHeaderTest
*/
Expand Down Expand Up @@ -95,8 +96,8 @@ public void setup() throws IOException, URISyntaxException, InterruptedException
testContentLengthServerH2.addHandler(new NoContentLengthHandler(), NO_BODY_PATH);
testContentLengthServerH3.addHandler(new NoContentLengthHandler(), NO_BODY_PATH);
testContentLengthServerH1.addHandler(new ContentLengthHandler(), BODY_PATH);
testContentLengthServerH2.addHandler(new OptionalContentLengthHandler(), BODY_PATH);
testContentLengthServerH3.addHandler(new OptionalContentLengthHandler(), BODY_PATH);
testContentLengthServerH2.addHandler(new ContentLengthHandler(), BODY_PATH);
testContentLengthServerH3.addHandler(new ContentLengthHandler(), BODY_PATH);
testContentLengthURIH1 = URIBuilder.newBuilder()
.scheme("http")
.loopback()
Expand Down Expand Up @@ -163,6 +164,13 @@ Object[][] bodies() {
};
}

@DataProvider(name = "h1body")
Object[][] h1body() {
return new Object[][]{
{HTTP_1_1, URI.create(testContentLengthURIH1 + BODY_PATH)}
};
}

@DataProvider(name = "nobodies")
Object[][] nobodies() {
return new Object[][]{
Expand All @@ -186,6 +194,35 @@ public void getWithNoBody(Version version, URI uri) throws IOException, Interrup
assertEquals(resp.version(), version);
}

@Test(dataProvider = "nobodies")
// A GET request with empty request body should have no Content-length header
public void getWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking GET with no request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.method("GET", HttpRequest.BodyPublishers.noBody())
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

@Test(dataProvider = "bodies")
// A GET request with empty request body and explicitly added Content-length header
public void getWithZeroContentLength(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking GET with no request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.method("GET", HttpRequest.BodyPublishers.noBody())
.header("Content-length", "0")
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

@Test(dataProvider = "bodies")
// A GET request with a request body should have a Content-length header
// in HTTP/1.1
Expand Down Expand Up @@ -215,6 +252,20 @@ public void deleteWithNoBody(Version version, URI uri) throws IOException, Inter
assertEquals(resp.version(), version);
}

@Test(dataProvider = "nobodies")
// A DELETE request with empty request body should have no Content-length header
public void deleteWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking DELETE with no request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.method("DELETE", HttpRequest.BodyPublishers.noBody())
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

@Test(dataProvider = "bodies")
// A DELETE request with a request body should have a Content-length header
// in HTTP/1.1
Expand Down Expand Up @@ -244,6 +295,20 @@ public void headWithNoBody(Version version, URI uri) throws IOException, Interru
assertEquals(resp.version(), version);
}

@Test(dataProvider = "nobodies")
// A HEAD request with empty request body should have no Content-length header
public void headWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking HEAD with no request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.method("HEAD", HttpRequest.BodyPublishers.noBody())
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

@Test(dataProvider = "bodies")
// A HEAD request with a request body should have a Content-length header
// in HTTP/1.1
Expand All @@ -261,6 +326,66 @@ public void headWithBody(Version version, URI uri) throws IOException, Interrupt
assertEquals(resp.version(), version);
}

@Test(dataProvider = "h1body")
// A POST request with empty request body should have a Content-length header
// in HTTP/1.1
public void postWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking POST with request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.method("POST", HttpRequest.BodyPublishers.noBody())
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

@Test(dataProvider = "bodies")
// A POST request with a request body should have a Content-length header
// in HTTP/1.1
public void postWithBody(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking POST with request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.POST(HttpRequest.BodyPublishers.ofString("POST Body"))
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

@Test(dataProvider = "h1body")
// A PUT request with empty request body should have a Content-length header
// in HTTP/1.1
public void putWithEmptyBody(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking PUT with request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.method("PUT", HttpRequest.BodyPublishers.noBody())
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

@Test(dataProvider = "bodies")
// A PUT request with a request body should have a Content-length header
// in HTTP/1.1
public void putWithBody(Version version, URI uri) throws IOException, InterruptedException {
testLog.println(version + " Checking PUT with request body");
HttpRequest req = HttpRequest.newBuilder()
.version(version)
.PUT(HttpRequest.BodyPublishers.ofString("PUT Body"))
.uri(uri)
.build();
HttpResponse<String> resp = hc.send(req, HttpResponse.BodyHandlers.ofString(UTF_8));
assertEquals(resp.statusCode(), 200, resp.body());
assertEquals(resp.version(), version);
}

public static void handleResponse(long expected, HttpTestExchange ex, String body, int rCode) throws IOException {
try (InputStream is = ex.getRequestBody()) {
byte[] reqBody = is.readAllBytes();
Expand Down Expand Up @@ -324,27 +449,4 @@ public void handle(HttpTestExchange exchange) throws IOException {
}
}
}

/**
* A handler used for cases where the presence of a Content-Length
* header is optional. If present, its value must match the number of
* bytes sent in the request body.
*/
static class OptionalContentLengthHandler implements HttpTestHandler {

@Override
public void handle(HttpTestExchange exchange) throws IOException {
testLog.println("OptionalContentLengthHandler: Received Headers "
+ exchange.getRequestHeaders().entrySet() +
" from " + exchange.getRequestMethod() + " request.");
Optional<String> contentLength = exchange.getRequestHeaders().firstValue("Content-Length");

// Check Content-length header was set
if (contentLength.isPresent()) {
handleResponse(Long.parseLong(contentLength.get()), exchange, "Request completed", 200);
} else {
handleResponse(-1, exchange, "Request completed, no content length", 200);
}
}
}
}