Fixes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/src/bin/client.rs b/src/bin/client.rs
index 6236b4811c3dd34a627404f3342c2e0e7c09e631..00a27696a39690c27b3916d4698e2ad81cda3da9 100644 (file)
--- a/src/bin/client.rs
+++ b/src/bin/client.rs
@@ -40,7 +40,7 @@ fn submit_request<'r, 'c:'r, C:HCC>(
   base64::encode_config_buf(&hmac, BASE64_CONFIG, &mut token);
 
   let prefix1 = format!(into_crlfs!(
-    r#"--
+    r#"--b
        Content-Type: text/plain; charset="utf-8"
        Content-Disposition: form-data; name="m"
 
@@ -56,7 +56,7 @@ fn submit_request<'r, 'c:'r, C:HCC>(
 
   let prefix2 = format!(into_crlfs!(
     r#"
-       --
+       --b
        Content-Type: application/octet-stream
        Content-Disposition: form-data; name="d"
 
@@ -84,7 +84,9 @@ fn submit_request<'r, 'c:'r, C:HCC>(
     ])
   );
 
-  let req = hyper::Request::post(&c.ic.url).body(body)
+  let req = hyper::Request::post(&c.ic.url)
+    .header("Content-Type", r#"multipart/form-data; boundary="b""#)
+    .body(body)
     .context("construct request")?;
 
   let resp = c.hclient.request(req);

diff --git a/src/prelude.rs b/src/prelude.rs
index dc2f0695e0304456159eccbafcf7f69eb0fdfad4..244d7766325ab48ba211f95c444f2e4425f2d858 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -24,7 +24,6 @@ pub use std::task::Poll;
 pub use std::time::{SystemTime, UNIX_EPOCH};
 
 pub use anyhow::{anyhow, Context};
-pub use base64::STANDARD_NO_PAD as BASE64_CONFIG;
 pub use extend::ext;
 pub use fehler::{throw, throws};
 pub use futures::{poll, future};
@@ -58,4 +57,6 @@ pub const SLIP_ESC_END: u8 = 0o334;
 pub const SLIP_ESC_ESC: u8 = 0o335;
 pub const SLIP_MIME_ESC: u8 = b'-';
 
+pub use base64::STANDARD as BASE64_CONFIG;
+
 pub fn default<T:Default>() -> T { Default::default() }