From 58bdab968b15c0865e84b7c2d0ab5612ad3f35dd Mon Sep 17 00:00:00 2001
From: Justin Geibel <jtgeibel@gmail.com>
Date: Tue, 26 May 2020 19:38:05 -0400
Subject: [PATCH] Bump to latest release of conduit-hyper

This upstream release now percent decodes the path component but not the
query string. This behavior aligns with the `civet` server. The known
difference is that `conduit-hyper` does a lossy utf8 conversion while
`civet` panics on invalid utf8 and closes the connection immediately.

This seems like a good compromise of matching the existing behavior as
closely as possible without copying the panic. I looked into fixing the
panic in `civet`, however the `to_str_slice` function returns an
`Option<&str>` and there is nowhere to store a newly allocated `String`
so changing the behavior there is not practical.

https://github.com/jtgeibel/conduit-hyper/compare/v0.3.0-alpha.3...v0.3.0-alpha.4
---
 Cargo.lock | 5 +++--
 Cargo.toml | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 2e2dce8f0f1..873b1a5974a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -372,13 +372,14 @@ dependencies = [
 
 [[package]]
 name = "conduit-hyper"
-version = "0.3.0-alpha.3"
+version = "0.3.0-alpha.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fd8258f712af3fc3b9ca293f12e322024f192aa9c793c07ab15f2eda544eef0e"
+checksum = "d4d0c38b49434c95e0a7cd8dc805c90e3c6975cb9454e158c994c35fa1bfe641"
 dependencies = [
  "conduit",
  "http",
  "hyper",
+ "percent-encoding 2.1.0",
  "tokio",
  "tower-service",
  "tracing",
diff --git a/Cargo.toml b/Cargo.toml
index 6e7cae6eab8..025a8eb5fbe 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -75,7 +75,7 @@ conduit-router = "0.9.0-alpha.2"
 conduit-static = "0.9.0-alpha.3"
 conduit-git-http-backend = "0.9.0-alpha.2"
 civet = "0.12.0-alpha.3"
-conduit-hyper = "0.3.0-alpha.3"
+conduit-hyper = "0.3.0-alpha.4"
 http = "0.2"
 
 futures-util = "0.3"