fixes

[hippotat.git] / client

diff --git a/client b/client
index 922242d3bca8fe1cb447a19ca73698f5c70057d4..3e3890f9b4cfe34e918ec9816d91f47a7cc34eca 100755 (executable)
--- a/client
+++ b/client
@@ -103,17 +103,19 @@ def check_outbound():
     
     crlf = b'\r\n'
     lf   =   b'\n'
     
     crlf = b'\r\n'
     lf   =   b'\n'

-    mime = (b'--b'                                      + crlf +
-            b'Content-Disposition: form-data; name="m"' + crlf + crlf +
-            str(c.client)             .encode('ascii')  + crlf +
-            password                                    + crlf +
-            str(c.target_outstanding) .encode('ascii')  + crlf +
+    mime = (b'--b'                                        + crlf +
+            b'Content-Type: text/plain; charset="utf-8"'  + crlf +
+            b'Content-Disposition: form-data; name="m"'   + crlf + crlf +
+            str(c.client)             .encode('ascii')    + crlf +
+            password                                      + crlf +
+            str(c.target_outstanding) .encode('ascii')    + crlf +

           ((
           ((

-            b'--b'                                      + crlf +
-            b'Content-Disposition: form-data; name="d"' + crlf + crlf +
-            mime_translate(d)                           + crlf
+            b'--b'                                        + crlf +
+            b'Content-Type: application/octet-stream'     + crlf +
+            b'Content-Disposition: form-data; name="d"'   + crlf + crlf +
+            mime_translate(d)                             + crlf

            ) if len(d) else b'')                               +
            ) if len(d) else b'')                               +

-            b'--b--'                                    + crlf)
+            b'--b--'                                      + crlf)

 
     #df = open('data.dump.dbg', mode='wb')
     #df.write(mime)
 
     #df = open('data.dump.dbg', mode='wb')
     #df.write(mime)


@@ -123,7 +125,8 @@ def check_outbound():
     log_debug(DBG.HTTP_FULL, 'requesting: ' + str(mime))
 
     hh = { 'User-Agent': ['hippotat'],
     log_debug(DBG.HTTP_FULL, 'requesting: ' + str(mime))
 
     hh = { 'User-Agent': ['hippotat'],

-           'Content-Type': ['multipart/form-data; boundary="b"'] }
+           'Content-Type': ['multipart/form-data; boundary="b"'],
+           'Content-Length': [str(len(mime))] }

     req = agent.request(b'POST',
                         c.url,
                         twisted.web.client.Headers(hh))
     req = agent.request(b'POST',
                         c.url,
                         twisted.web.client.Headers(hh))