Skip to content

Commit

Permalink
Auto merge of #2533 - jtgeibel:percent-decode-uri-path, r=JohnTitor
Browse files Browse the repository at this point in the history
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.

r? @JohnTitor
cc #2204

conduit-rust/conduit-hyper@v0.3.0-alpha.3...v0.3.0-alpha.4
  • Loading branch information
bors committed May 27, 2020
2 parents 44f5639 + 58bdab9 commit 2df7413
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 2df7413

Please sign in to comment.