diff options
Diffstat (limited to 'src/web')
-rw-r--r-- | src/web/Cargo.toml | 23 | ||||
-rw-r--r-- | src/web/web_server.rs | 2 |
2 files changed, 13 insertions, 12 deletions
diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 5cc8683c..6c3b3a9a 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "garage_web" -version = "0.1.1" +version = "0.2.1" authors = ["Alex Auvolat <alex@adnab.me>", "Quentin Dufour <quentin@dufour.io>"] edition = "2018" -license = "GPL-3.0" +license = "AGPL-3.0" description = "S3-like website endpoint crate for the Garage object store" repository = "https://git.deuxfleurs.fr/Deuxfleurs/garage" @@ -13,16 +13,17 @@ path = "lib.rs" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -garage_util = { version = "0.1.1", path = "../util" } -garage_table = { version = "0.1.1", path = "../table" } -garage_model = { version = "0.1.1", path = "../model" } -garage_api = { version = "0.1.1", path = "../api" } +garage_api = { version = "0.2.1", path = "../api" } +garage_model = { version = "0.2.1", path = "../model" } +garage_util = { version = "0.2.1", path = "../util" } +garage_table = { version = "0.2.1", path = "../table" } -err-derive = "0.2.3" +err-derive = "0.3" +idna = "0.2" log = "0.4" +percent-encoding = "2.1.0" + futures = "0.3" + http = "0.2" -hyper = "0.13" -percent-encoding = "2.1.0" -roxmltree = "0.11" -idna = "0.2" +hyper = "0.14" diff --git a/src/web/web_server.rs b/src/web/web_server.rs index 24d111a9..cfde2bcc 100644 --- a/src/web/web_server.rs +++ b/src/web/web_server.rs @@ -99,7 +99,7 @@ async fn serve_file(garage: Arc<Garage>, req: Request<Body>) -> Result<Response< info!("Selected bucket: \"{}\", selected key: \"{}\"", bucket, key); let res = match req.method() { - &Method::HEAD => handle_head(garage, &bucket, &key).await?, + &Method::HEAD => handle_head(garage, &req, &bucket, &key).await?, &Method::GET => handle_get(garage, &req, bucket, &key).await?, _ => return Err(Error::BadRequest(format!("HTTP method not supported"))), }; |