diff options
| author | David Daney <ddaney@avtrex.com> | 2006-09-11 18:15:27 +0000 |
|---|---|---|
| committer | David Daney <daney@gcc.gnu.org> | 2006-09-11 18:15:27 +0000 |
| commit | 5a4ba983b85a81373f95f2b4b2a8825cddb8f3a2 (patch) | |
| tree | e98e8f318fc5b8860f69a1c0e3900d5af1192f18 /libjava/classpath/gnu/java/net/protocol | |
| parent | d29520088232b973624b0623763f0a9e307ef347 (diff) | |
| download | gcc-5a4ba983b85a81373f95f2b4b2a8825cddb8f3a2.zip gcc-5a4ba983b85a81373f95f2b4b2a8825cddb8f3a2.tar.gz gcc-5a4ba983b85a81373f95f2b4b2a8825cddb8f3a2.tar.bz2 | |
re PR classpath/28580 (HTTP HEAD fails on chuncked encoding)
PR classpath/28580
* gnu/java/net/protocol/http/Request.java (readResponse): Call
createResponseBodyStream in more cases and with new parameter.
(createResponseBodyStream): Added new parameter mayHaveBody. Handle
HEAD and !mayHaveBody responses specially.
From-SVN: r116853
Diffstat (limited to 'libjava/classpath/gnu/java/net/protocol')
| -rw-r--r-- | libjava/classpath/gnu/java/net/protocol/http/Request.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/libjava/classpath/gnu/java/net/protocol/http/Request.java b/libjava/classpath/gnu/java/net/protocol/http/Request.java index e15ec41..cd9d7ea 100644 --- a/libjava/classpath/gnu/java/net/protocol/http/Request.java +++ b/libjava/classpath/gnu/java/net/protocol/http/Request.java @@ -419,13 +419,16 @@ public class Request switch (code) { case 100: + break; case 204: case 205: case 304: + body = createResponseBodyStream(responseHeaders, majorVersion, + minorVersion, in, false); break; default: body = createResponseBodyStream(responseHeaders, majorVersion, - minorVersion, in); + minorVersion, in, true); } // Construct response @@ -453,7 +456,8 @@ public class Request private InputStream createResponseBodyStream(Headers responseHeaders, int majorVersion, int minorVersion, - InputStream in) + InputStream in, + boolean mayHaveBody) throws IOException { long contentLength = -1; @@ -466,7 +470,12 @@ public class Request (majorVersion == 1 && minorVersion == 0); String transferCoding = responseHeaders.getValue("Transfer-Encoding"); - if ("chunked".equalsIgnoreCase(transferCoding)) + if ("HEAD".equals(method) || !mayHaveBody) + { + // Special case no body. + in = new LimitedLengthInputStream(in, 0, true, connection, doClose); + } + else if ("chunked".equalsIgnoreCase(transferCoding)) { in = new LimitedLengthInputStream(in, -1, false, connection, doClose); |