OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
David Daney 2006-09-11 18:15:27 +00:00 committed by David Daney
parent d295200882
commit 5a4ba983b8
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libjava/classpath/ChangeLog.gcj
View File

@ -1,3 +1,11 @@
2006-09-11 David Daney <ddaney@avtrex.com>
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.
2006-09-05 Gary Benson <gbenson@redhat.com>
* java/net/SocketPermission.java

15
libjava/classpath/gnu/java/net/protocol/http/Request.java
View File

@ -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);