Update deps, remove compression

Cargo.toml

@@ -8,9 +8,9 @@ build = "src/build.rs"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-actix-web = { version = "4.0.0-beta.4", default-features = false, features = ["compress"] }
+actix-web = { version = "4.0.0-beta.7", default-features = false }
 anyhow = "1.0"
-awc = { version = "3.0.0-beta.3", default-features = false, features = ["compress", "rustls"] }
+awc = { version = "3.0.0-beta.6", default-features = false, features = ["rustls"] }
 bcrypt = "0.9"
 env_logger = "0.8.2"
 futures = "0.3"

src/connection.rs

@@ -47,12 +47,14 @@ impl Connection {
     ) -> Result<Images, UploadError> {
         let client_request = self.client.request_from(self.upload_url(), req.head());
 
-        let client_request = if let Some(addr) = req.head().peer_addr {
+        let mut client_request = if let Some(addr) = req.head().peer_addr {
             client_request.append_header(("X-Forwarded-For", addr.to_string()))
         } else {
             client_request
         };
 
+        client_request.headers_mut().remove("Accept-Encoding");
+
         let mut res = client_request
             .send_stream(body)
             .await
@@ -119,7 +121,11 @@ impl Connection {
             client_request
         };
 
-        let res = client_request.no_decompress().send().await?;
+        let res = client_request
+            .no_decompress()
+            .send()
+            .await
+            .map_err(|_| UploadError::Request)?;
 
         let mut client_res = HttpResponse::build(res.status());
 

src/lib.rs

@@ -1,10 +1,9 @@
 use actix_web::{
-    dev::HttpResponseBuilder,
     http::{
         header::{CacheControl, CacheDirective, ContentType, LastModified, LOCATION},
         StatusCode,
     },
-    web, HttpRequest, HttpResponse, ResponseError, Scope,
+    web, HttpRequest, HttpResponse, HttpResponseBuilder, ResponseError, Scope,
 };
 use awc::Client;
 use sled::Db;

src/main.rs

@@ -1,7 +1,4 @@
-use actix_web::{
+use actix_web::{middleware::Logger, App, HttpServer};
-    middleware::{Compress, Logger},
-    App, HttpServer,
-};
 use awc::Client;
 use std::time::Duration;
 use structopt::StructOpt;
@@ -27,7 +24,6 @@ async fn main() -> Result<(), anyhow::Error> {
 
         App::new()
             .wrap(Logger::default())
-            .wrap(Compress::default())
             .service(pict_rs_aggregator::service(client, state.clone()))
     })
     .bind(bind_address)?