From 33f6ca6c351e7b041fa92ea08ebbdeaf42a8d3be Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sun, 1 Aug 2021 18:15:48 +0100 Subject: [PATCH] Fixes Signed-off-by: Ian Jackson --- src/bin/client.rs | 8 +++++--- src/prelude.rs | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/bin/client.rs b/src/bin/client.rs index 6236b48..00a2769 100644 --- 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 dc2f069..244d776 100644 --- 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::default() } -- 2.30.2