Skip to content

Commit

Permalink
Merge #1476
Browse files Browse the repository at this point in the history
1476: Revert "Merge #1378" r=carols10cents a=jtgeibel

This reverts commit ba6c689, reversing changes made to 9b4a92c.

This reverts the changes introduced in PR #1378.  The deploy has already been rolled back and this will get master back into a clean state so that deploys can be made if other issues arise before this bug can be resolved.  The code reverted by this PR was causing `cargo publish` to fail with a 404 error.

The issue appears to be triggered because `cargo publish` includes an additional `/` at the beginning of its route.  It is possible that civet removes this automatically before it gets to conduit's routing logic, and that hyper leaves the extra `/` intact, causing the routing logic to fail to find the correct handler.

Co-authored-by: Justin Geibel <[email protected]>
  • Loading branch information
bors-voyager[bot] and jtgeibel committed Aug 15, 2018
2 parents ba6c689 + 6f487d1 commit c2d8371
Show file tree
Hide file tree
Showing 4 changed files with 225 additions and 237 deletions.
Loading

0 comments on commit c2d8371

Please sign in to comment.