[cp-patches] FYI: Remerge http Connection with libgcj again

[Mark Wielaard]

Hi,

This merges our http Connection class with libgcj again:

2004-11-06  Tom Tromey  <address@hidden>

       * gnu/java/net/protocol/http/Connection.java (sendRequest): Fix
       typo.

2004-11-06  Michael Koch  <address@hidden>

       PR libjava/14009
       * gnu/java/net/protocol/http/Connection.java
       (sendRequest): Handle case when url.getFile() returns an empty string.

Committed,

Mark

--- gnu/java/net/protocol/http/Connection.java  26 Oct 2004 11:51:47 -0000     
1.21
+++ gnu/java/net/protocol/http/Connection.java  6 Nov 2004 12:55:00 -0000
@@ -217,8 +217,10 @@
       new PrintWriter(new OutputStreamWriter(outputStream, "8859_1"));

     // Send request including any request properties that were set.
-    outputWriter.print (getRequestMethod() + " " + url.getFile()
-                        + " HTTP/1.1\r\n");
+    String requestFile = url.getFile();
+    outputWriter.print(getRequestMethod() + " "
+                      + (requestFile.length() != 0 ? requestFile : "/")
+                       + " HTTP/1.1\r\n");

     // Set additional HTTP headers.
     if (getRequestProperty ("Host") == null)

signature.asc
Description: This is a digitally signed message part