@@ -13,6 +13,7 @@ import qualified Data.ByteString.Char8 as S8
1313import qualified Data.ByteString.Lazy.Char8 as L8
1414import qualified Data.ByteString.Lazy as L
1515import qualified Data.Text.Lazy as T
16+import qualified Data.Text.Encoding as TE
1617import Control.Arrow
1718
1819import Network.Wai.Middleware.Jsonp
@@ -21,7 +22,7 @@ import Network.Wai.Middleware.Vhost
2122import Network.Wai.Middleware.Autohead
2223import Network.Wai.Middleware.MethodOverride
2324import Network.Wai.Middleware.AcceptOverride
24−import Network.Wai.Middleware.Debug (debugHandle)
25+import Network.Wai.Middleware.RequestLogger (logHandle)
2526import Codec.Compression.GZip (decompress)
2627
2728import qualified Data.Conduit as C
@@ -169,7 +170,7 @@ toRequest :: S8.ByteString -> S8.ByteString -> SRequest
169170toRequest ctype content = SRequest defaultRequest
170171 { requestHeaders = [("Content-Type", ctype)]
171172 , requestMethod = "POST"
172− , rawPathInfo = ""
173+ , rawPathInfo = "/"
173174 , rawQueryString = ""
174175 , queryString = []
175176 } (L.fromChunks [content])
@@ -423,10 +424,14 @@ caseDebugRequestBody = do
423424 }
424425 where
425426 params = [("foo", "bar"), ("baz", "bin")]
426− postOutput = T.pack $ "POST \nAccept: \nPOST " ++ (show params)
427− getOutput _qs = T.pack $ "GET /location" ++ "\nAccept: \nGET " ++ (show params) -- \nAccept: \n" ++ (show params)
427+ -- FIXME change back once we include post parameter output in logging postOutput = T.pack $ "POST \nAccept: \nPOST " ++ (show params)
428+ postOutput = T.pack $ "POST / Accept: "
429+ -- FIXME getOutput _qs = T.pack $ "GET /location" ++ "\nAccept: \nGET " ++ (show params) -- \nAccept: \n" ++ (show params)
430+ getOutput _qs = T.pack $ "GET /location?foo=bar&baz=bin Accept: "
428431
429− debugApp output = debugHandle (\t -> liftIO $ assertEqual "debug" output t) $ \_req -> do
432+ debugApp output' = logHandle (\t -> liftIO $ assertEqual "debug" output t) $ \_req -> do
430433 return $ responseLBS status200 [ ] ""
434+ where
435+ output = TE.encodeUtf8 $ T.toStrict output'
431436 {-debugApp = debug $ \req -> do-}
432437 {-return $ responseLBS status200 [ ] ""-}