From 6506cf001a15d5b54448395f15402cdcc625e3d5 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 15 Jan 2015 08:47:40 +0200 Subject: [PATCH] Revert UrlMap changes from #325 --- wai-extra/ChangeLog.md | 4 ---- wai-extra/Network/Wai/UrlMap.hs | 2 +- wai-extra/wai-extra.cabal | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/wai-extra/ChangeLog.md b/wai-extra/ChangeLog.md index bf0fdd75..0b459789 100644 --- a/wai-extra/ChangeLog.md +++ b/wai-extra/ChangeLog.md @@ -1,7 +1,3 @@ -## 3.0.4.2 - -* `UrlMap`: do not modify `rawPathInfo`, see [#325](https://github.com/yesodweb/wai/issues/325) - ## 3.0.4.1 Fix compilation failure on Windows [#321](https://github.com/yesodweb/wai/issues/321) diff --git a/wai-extra/Network/Wai/UrlMap.hs b/wai-extra/Network/Wai/UrlMap.hs index 0c2a29f0..6bee1c1b 100644 --- a/wai-extra/Network/Wai/UrlMap.hs +++ b/wai-extra/Network/Wai/UrlMap.hs @@ -88,7 +88,7 @@ instance ToApplication UrlMap where case try (pathInfo req) (unUrlMap urlMap) of Just (newPath, app) -> app (req { pathInfo = newPath - --, rawPathInfo = makeRaw newPath + , rawPathInfo = makeRaw newPath }) sendResponse Nothing -> sendResponse $ responseLBS diff --git a/wai-extra/wai-extra.cabal b/wai-extra/wai-extra.cabal index 400612ca..55b9e912 100644 --- a/wai-extra/wai-extra.cabal +++ b/wai-extra/wai-extra.cabal @@ -1,5 +1,5 @@ Name: wai-extra -Version: 3.0.4.2 +Version: 3.0.4.1 Synopsis: Provides some basic WAI handlers and middleware. description: API docs and the README are available at . License: MIT