diff --git a/happstack-wai.cabal b/happstack-wai.cabal index 14b58f2..cb3c9ff 100644 --- a/happstack-wai.cabal +++ b/happstack-wai.cabal @@ -25,7 +25,7 @@ library case-insensitive == 0.4.*, conduit == 0.2.*, containers == 0.4.*, - happstack-server == 6.5.* || == 6.6.*, + happstack-server >= 6.4 && < 6.7, http-types == 0.6.*, old-locale == 1.0.*, text == 0.11.*, diff --git a/src/Happstack/Server/Wai.hs b/src/Happstack/Server/Wai.hs index 5ce4a82..1ce70eb 100644 --- a/src/Happstack/Server/Wai.hs +++ b/src/Happstack/Server/Wai.hs @@ -59,7 +59,9 @@ convertRequest wReq = do return $ H.Request +#if MIN_VERSION_happstack_server(6,5,0) (W.isSecure wReq) +#endif (convertMethod $ W.requestMethod wReq) (convertPath $ W.pathInfo wReq) rawPath -- includes leading slash, does not include query