From 16b854df1a370d876be6bef499a93f5837c9b4da Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Sun, 6 Dec 2009 08:21:25 +0200 Subject: [PATCH] Pegged Hack at 2009.10.30 --- Hack/Middleware/ClientSession.hs | 8 ++++---- restful.cabal | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Hack/Middleware/ClientSession.hs b/Hack/Middleware/ClientSession.hs index e58a4e99..76a9f8cb 100644 --- a/Hack/Middleware/ClientSession.hs +++ b/Hack/Middleware/ClientSession.hs @@ -58,12 +58,12 @@ clientsession cnames key app env = do cookiesRaw :: String cookiesRaw = intercalate "; " $ map (\(k, v) -> k ++ "=" ++ v) cookies - remoteHost :: String - remoteHost = fromMaybe "" $ lookup "REMOTE_HOST" $ http env + remoteHost' :: String + remoteHost' = remoteHost env now <- getCurrentTime let convertedCookies = takeJusts $ - map (decodeCookie key now remoteHost) interceptCookies + map (decodeCookie key now remoteHost') interceptCookies let env' = env { http = ("Cookie", cookiesRaw) : filter (fst `equals` "Cookie") (http env) ++ nonCookies @@ -77,7 +77,7 @@ clientsession cnames key app env = do let exp = fromIntegral twentyMinutes `addUTCTime` now let formattedExp = formatTime defaultTimeLocale "%a, %d-%b-%Y %X %Z" exp let oldCookies = filter (\(k, _) -> not $ k `elem` map fst interceptHeaders) convertedCookies - let newCookies = map (setCookie key exp formattedExp remoteHost) $ + let newCookies = map (setCookie key exp formattedExp remoteHost') $ oldCookies ++ interceptHeaders let res' = res { headers = newCookies ++ headers' } return res' diff --git a/restful.cabal b/restful.cabal index 7314886a..f9cb8a79 100644 --- a/restful.cabal +++ b/restful.cabal @@ -23,7 +23,7 @@ library build-depends: base >= 4 && < 5, old-locale >= 1.0.0.1 && < 1.1, time >= 1.1.3 && < 1.2, - hack >= 2009.5.19, + hack == 2009.10.30, split >= 0.1.1 && < 0.2, authenticate >= 0.4.0 && < 0.5, data-default >= 0.2 && < 0.3,