From 5a4ba983b85a81373f95f2b4b2a8825cddb8f3a2 Mon Sep 17 00:00:00 2001
From: David Daney <ddaney@avtrex.com>
Date: Mon, 11 Sep 2006 18:15:27 +0000
Subject: [PATCH] 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
---
 libjava/classpath/ChangeLog.gcj                   |  8 ++++++++
 .../gnu/java/net/protocol/http/Request.java       | 15 ++++++++++++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/libjava/classpath/ChangeLog.gcj b/libjava/classpath/ChangeLog.gcj
index 18a890a928e..923e6070d82 100644
--- a/libjava/classpath/ChangeLog.gcj
+++ b/libjava/classpath/ChangeLog.gcj
@@ -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
diff --git a/libjava/classpath/gnu/java/net/protocol/http/Request.java b/libjava/classpath/gnu/java/net/protocol/http/Request.java
index e15ec4182a4..cd9d7ea4423 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);