2002/09/15 23:35:17

darcs-hash:20040130065028-2ba56-3f79cb8b25b94d22b46133679cdb1a564d8e0ddb.gz

diff --git a/CHANGES b/CHANGES
index c1230d7..428b73c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -404,4 +404,6 @@
 15-Sep megacz Box.java: committed a change that I forgot to commit
               dealing with box removal.
 
+15-Sep megacz HTTP.java: fixed end-of-header detection
+
 

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index da3425e..e3dd06f 100644 (file)
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -363,7 +363,10 @@ public class HTTP {
         PrintWriter pw = new PrintWriter(new OutputStreamWriter(sock.getOutputStream()));
         if (content != null) {
             pw.print("POST " + path + " HTTP/1.1\r\n");
-            pw.print("Content-Length: " + (content.length() - content.indexOf("\r\n\r\n") - 4) + "\r\n");
+           int contentLength = content.substring(0, 2).equals("\r\n") ?
+               content.length() - 2 :
+               (content.length() - content.indexOf("\r\n\r\n") - 4);
+            pw.print("Content-Length: " + contentLength + "\r\n");
             if (contentType != null) pw.print("Content-Type: " + contentType + "\r\n");
         } else {
             pw.print("GET " + path + " HTTP/1.1\r\n");