archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-23 12:34:32 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8211420: com.sun.net.httpserver.HttpServer returns Content-length header for 204 response code

Browse source 
Reviewed-by: chegar
This commit is contained in:
Michael McMahon 2018-10-05 11:28:23 +01:00
parent a5c9fa14f1
commit e8f90125d2
2 changed files with 115 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/jdk.httpserver/share/classes/sun/net/httpserver/ExchangeImpl.java
View file

@ -210,6 +210,7 @@ class ExchangeImpl {
PlaceholderOutputStream o = getPlaceholderResponseBody();
tmpout.write (bytes(statusLine, 0), 0, statusLine.length());
boolean noContentToSend = false; // assume there is content
boolean noContentLengthHeader = false; // must not send Content-length is set
rspHdrs.set ("Date", dateFormat.get().format (new Date()));
/* check for response type that is not allowed to send a body */
@ -225,6 +226,7 @@ class ExchangeImpl {
logger.log (Level.WARNING, msg);
}
contentLen = -1;
noContentLengthHeader = (rCode != 304);
}
if (isHeadRequest() || rCode == 304) {
@ -253,7 +255,11 @@ class ExchangeImpl {
noContentToSend = true;
contentLen = 0;
}
rspHdrs.set("Content-length", Long.toString(contentLen));
if (noContentLengthHeader) {
rspHdrs.remove("Content-length");
} else {
rspHdrs.set("Content-length", Long.toString(contentLen));
}
o.setWrappedStream (new FixedLengthOutputStream (this, ros, contentLen));
}
}