From 784675919b281e77e6b300f37275ed4afc31f151 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Thu, 11 Feb 2010 20:55:19 +0200
Subject: [PATCH] Match wai renamings

---
 Yesod/Request.hs | 8 ++++----
 Yesod/Yesod.hs   | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Yesod/Request.hs b/Yesod/Request.hs
index 56b39925..f8843564 100644
--- a/Yesod/Request.hs
+++ b/Yesod/Request.hs
@@ -112,9 +112,9 @@ cookies rr name = map snd . filter (fst `equals` name) . rawCookies $ rr
 parseWaiRequest :: W.Request -> [(B.ByteString, B.ByteString)] -> IO RawRequest
 parseWaiRequest env session = do
     let gets' = map (cs *** cs) $ decodeUrlPairs $ W.queryString env
-    let rawCookie = fromMaybe B.empty $ lookup W.Cookie $ W.httpHeaders env
+    let rawCookie = fromMaybe B.empty $ lookup W.Cookie $ W.requestHeaders env
         cookies' = map (cs *** cs) $ parseCookies rawCookie
-        acceptLang = lookup W.AcceptLanguage $ W.httpHeaders env
+        acceptLang = lookup W.AcceptLanguage $ W.requestHeaders env
         langs = map cs $ maybe [] parseHttpAccept acceptLang
         langs' = case lookup langKey cookies' of
                     Nothing -> langs
@@ -132,8 +132,8 @@ rbHelper mvar = modifyMVar mvar helper where
     helper (Left env) = do
         inputLBS <- WE.toLBS $ W.requestBody env -- FIXME
         let clength = maybe "0" cs  $ lookup W.ReqContentLength
-                                    $ W.httpHeaders env
-        let ctype = maybe "" cs $ lookup W.ReqContentType $ W.httpHeaders env
+                                    $ W.requestHeaders env
+        let ctype = maybe "" cs $ lookup W.ReqContentType $ W.requestHeaders env
         let convertFileInfo (FileInfo a b c) = FileInfo (cs a) (cs b) c
         let ret = map (cs *** cs) ***
                   map (cs *** convertFileInfo)
diff --git a/Yesod/Yesod.hs b/Yesod/Yesod.hs
index 77b0852e..31069e5d 100644
--- a/Yesod/Yesod.hs
+++ b/Yesod/Yesod.hs
@@ -131,4 +131,4 @@ httpAccept = map contentTypeFromBS
            . parseHttpAccept
            . fromMaybe B.empty
            . lookup W.Accept
-           . W.httpHeaders
+           . W.requestHeaders