Suuport happstack-server 6.4.

aslatter · Feb 17, 2012 · 500a7ef · 500a7ef
1 parent 9523b44
commit 500a7ef
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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