2002/08/24 22:45:14

darcs-hash:20040130065017-2ba56-bfe0a69cf24f4fb36012db4675962e29e1ddcc1d.gz

diff --git a/CHANGES b/CHANGES
index 40149fc..18039a5 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -388,4 +388,7 @@
 
 21-Aug megacz PalmOS.java, PalmOS.xml, jump.jar: began work on PalmOS port.
 
+24-Aug megacz HTTP.java, SOAP.java: fixed bug which caused
+              miscalculation of the Content-Length header.
+
 

diff --git a/src/org/xwt/HTTP.java b/src/org/xwt/HTTP.java
index 258dc75..da3425e 100644 (file)
--- a/src/org/xwt/HTTP.java
+++ b/src/org/xwt/HTTP.java
@@ -363,7 +363,7 @@ 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() + "\r\n");
+            pw.print("Content-Length: " + (content.length() - content.indexOf("\r\n\r\n") - 4) + "\r\n");
             if (contentType != null) pw.print("Content-Type: " + contentType + "\r\n");
         } else {
             pw.print("GET " + path + " HTTP/1.1\r\n");

diff --git a/src/org/xwt/SOAP.java b/src/org/xwt/SOAP.java
index 3c3ed7d..1a279f4 100644 (file)
--- a/src/org/xwt/SOAP.java
+++ b/src/org/xwt/SOAP.java
@@ -165,21 +165,21 @@ class SOAP extends XMLRPC {
             if ((double)((Number)o).intValue() == ((Number)o).doubleValue()) {
                 sb.append("                <" + name + " xsi:type=\"xsd:int\">");
                 sb.append(((Number)o).intValue());
-                sb.append("</" + name + ">\n");
+                sb.append("</" + name + ">\r\n");
             } else {
                 sb.append("                <" + name + " xsi:type=\"xsd:double\">");
                 sb.append(o);
-                sb.append("</" + name + ">\n");
+                sb.append("</" + name + ">\r\n");
             }
 
         } else if (o instanceof Boolean) {
             sb.append("                <" + name + " xsi:type=\"xsd:boolean\">");
             sb.append(((Boolean)o).booleanValue() ? "true" : "false");
-            sb.append("</" + name + ">\n");
+            sb.append("</" + name + ">\r\n");
 
         } else if (o instanceof ByteStream) {
             try {
-                sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\n");
+                sb.append("                <" + name + " xsi:type=\"SOAP-ENC:base64\">\r\n");
                 InputStream is = ((ByteStream)o).getInputStream();
                 byte[] buf = new byte[54];
                 while(true) {
@@ -192,10 +192,10 @@ class SOAP extends XMLRPC {
                     }
                     sb.append("              ");
                     sb.append(new String(Base64.encode(writebuf)));
-                    sb.append("\n");
+                    sb.append("\r\n");
                 }
                 sb.append(((Boolean)o).booleanValue() ? "1" : "0");
-                sb.append("</" + name + ">\n");
+                sb.append("</" + name + ">\r\n");
             } catch (IOException e) {
                 if (Log.on) Log.log(this, "caught IOException while attempting to send a ByteStream via SOAP");
                 if (Log.on) Log.log(this, e);
@@ -219,14 +219,14 @@ class SOAP extends XMLRPC {
                     i = oldi = i + 1;
                 }
             }
-            sb.append("</" + name + ">\n");
+            sb.append("</" + name + ">\r\n");
 
         } else if (o instanceof NativeArray) {
             NativeArray na = (NativeArray)o;
             sb.append("                <" + name + " SOAP-ENC:arrayType=\"xsd:ur-type[" + na.jsGet_length() + "]\">");
             for(int i=0; i<na.jsGet_length(); i++)
                 appendObject("item", na.get(i, na), sb);
-            sb.append("</" + name + ">\n");
+            sb.append("</" + name + ">\r\n");
 
         } else if (o instanceof Scriptable && !(o instanceof Undefined)) {
             Scriptable s = (Scriptable)o;
@@ -234,7 +234,7 @@ class SOAP extends XMLRPC {
             Object[] ids = s.getIds();
             for(int i=0; i<ids.length; i++)
                 appendObject(ids[i].toString(), s.get(ids[i].toString(), s), sb);
-            sb.append("</" + name + ">\n");
+            sb.append("</" + name + ">\r\n");
         }
     }
 
@@ -242,23 +242,23 @@ class SOAP extends XMLRPC {
         // build up the request
         StringBuffer content = new StringBuffer();
         content.append("SOAPAction: " + action + "\r\n\r\n");
-        content.append("<?xml version=\"1.0\"?>\n");
-        content.append("<SOAP-ENV:Envelope SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"\n");
-        content.append("                   xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\"\n");
-        content.append("                   xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"\n");
-        content.append("                   xmlns:xsd=\"http://www.w3.org/1999/XMLSchema\"\n");
-        content.append("                   xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\">\n");
-        content.append("<SOAP-ENV:Body>\n");
+        content.append("<?xml version=\"1.0\"?>\r\n");
+        content.append("<SOAP-ENV:Envelope SOAP-ENV:encodingStyle=\"http://schemas.xmlsoap.org/soap/encoding/\"\r\n");
+        content.append("                   xmlns:SOAP-ENC=\"http://schemas.xmlsoap.org/soap/encoding/\"\r\n");
+        content.append("                   xmlns:SOAP-ENV=\"http://schemas.xmlsoap.org/soap/envelope/\"\r\n");
+        content.append("                   xmlns:xsd=\"http://www.w3.org/1999/XMLSchema\"\r\n");
+        content.append("                   xmlns:xsi=\"http://www.w3.org/1999/XMLSchema-instance\">\r\n");
+        content.append("<SOAP-ENV:Body>\r\n");
         content.append("    <");
         content.append(methodname);
         content.append(nameSpace != null ? " xmlns=\"" + nameSpace + "\"" : "");
-        content.append(">\n");
+        content.append(">\r\n");
         if (args.length > 0) {
             Object[] o = ((Scriptable)args[0]).getIds();
             for(int i=0; i<o.length; i++)
                 appendObject(o[i].toString(), ((Scriptable)args[0]).get(o[i].toString(), (Scriptable)args[0]), content);
         }
-        content.append("    </" + methodname + "></SOAP-ENV:Body></SOAP-ENV:Envelope>");
+        content.append("    </" + methodname + "></SOAP-ENV:Body></SOAP-ENV:Envelope>\r\n");
         return content.toString();
     }