Merge branch 'master' into raw-response
Conflicts:
warp/Network/Wai/Handler/Warp/Run.hs
commit2d166e8bd6509b4256f3cebceb02da595535b526
authorMichael Snoyman <michael@snoyman.com>
dateThu 6 Mar 2014, 07:07 (13 years ago)
parent928cdffb9d1c43
.gitignore+2−2
@@ -1,9 +1,9 @@
11dist/
22*.swp
3−cabal-dev
4−.virthualenv
53*.hi
64*.o
75tarballs/
86/.hsenv
97/.shelly
8+.cabal-sandbox/
9+cabal.sandbox.config
wai-extra/Network/Wai/Middleware/RequestLogger.hs+1−1
@@ -233,7 +233,7 @@ detailedMiddleware' cb getAddColor app req = do
233233 liftIO $ cb $ mconcat $ map toLogStr $ addColor (requestMethod req) ++
234234 [ " "
235235 , rawPathInfo req
236− , " | "
236+ , " :: "
237237 , accept
238238 , paramsToBS "GET " getParams
239239 , paramsToBS "POST " postParams