hack2-handler-snap-server 2011.10.12 → 2011.10.30

raw patch · 2 files changed

+6/−5 lines, 2 filesdep ~snap-server

Dependency ranges changed: snap-server

Files

• hack2-handler-snap-server.cabal +2/−2
• src/Hack2/Handler/SnapServer.hs +4/−3

@@ -1,5 +1,5 @@ Name:                 hack2-handler-snap-server-Version:              2011.10.12+Version:              2011.10.30 Build-type:           Simple Synopsis:             Hack2 Snap server handler Description:          Hack2 Snap server handler@@ -28,7 +28,7 @@                     , case-insensitive                     , air                     , snap-core-                    , snap-server+                    , snap-server > 0.6                     , directory                        hs-source-dirs: src/

@@ -26,7 +26,8 @@ import qualified Data.Enumerator.List as EL import Blaze.ByteString.Builder (Builder, fromByteString, fromLazyByteString) -import qualified Snap.Types as Snap+import qualified Snap.Core as Snap+import Snap.Types.Headers as Snap.Headers import qualified Snap.Internal.Http.Types as SnapInternal  import Data.Maybe (listToMaybe, fromMaybe)@@ -69,7 +70,7 @@     , queryString    = request.Snap.rqQueryString -- .B.dropWhile (is '?')     , serverName     = request.Snap.rqServerName     , serverPort     = request.Snap.rqServerPort-    , httpHeaders    = request.SnapInternal.rqHeaders.toAscList.map_snd (listToMaybe > fromMaybe B.empty) .map caseInsensitiveHeaderToHeader+    , httpHeaders    = request.SnapInternal.rqHeaders.Snap.Headers.toList.map caseInsensitiveHeaderToHeader     , hackUrlScheme  = if request.Snap.rqIsSecure then HTTPS else HTTP     , hackInput      = HackEnumerator some_enumerator     , hackHeaders    = @@ -101,7 +102,7 @@ hackResponseToSnapResponse response =    Snap.emptyResponse     . Snap.setResponseCode (response.status)-    . (\r -> r { SnapInternal.rspHeaders = response.headers.map headerToCaseInsensitiveHeader. map_snd return .fromAscList })+    . (\r -> r { SnapInternal.rspHeaders = response.headers.map headerToCaseInsensitiveHeader.Snap.Headers.fromList })     . Snap.setResponseBody (response.body.unHackEnumerator $= EL.map fromByteString)