diff --git a/HTTP.cabal b/HTTP.cabal --- a/HTTP.cabal +++ b/HTTP.cabal @@ -1,11 +1,11 @@ Name: HTTP -Version: 4000.2.15 +Version: 4000.2.16 Cabal-Version: >= 1.8 Build-type: Simple License: BSD3 License-file: LICENSE Author: Warrick Gray -Maintainer: Ganesh Sittampalam +Maintainer: Ganesh Sittampalam Homepage: https://github.com/haskell/HTTP Category: Network Synopsis: A library for client-side HTTP @@ -64,6 +64,11 @@ description: Use version 1.0.x or below of the conduit package (for the test suite) default: False +Flag warp-tests + description: Test against warp + default: True + manual: True + Library Exposed-modules: Network.BufferType, @@ -87,7 +92,9 @@ Paths_HTTP GHC-options: -fwarn-missing-signatures -Wall - Build-depends: base >= 3.0 && < 4.8, network >= 2.2.0.1 && < 2.6, parsec >= 2.0 && < 3.2 + -- note the test harness constraints should be kept in sync with these + -- where dependencies are shared + Build-depends: base >= 3.0.3.1 && < 4.8, parsec >= 2.0 && < 3.2 Build-depends: array >= 0.2.0.0 && < 0.6, old-time >= 1.0.0.0 && < 1.2, bytestring >= 0.9.1.3 && < 0.11 Extensions: FlexibleInstances @@ -98,6 +105,13 @@ else Build-depends: mtl >= 2.0 && < 2.3 + if impl(ghc<6.12) + -- clients get a "no buffering" error with + -- GHC 6.10 and later versions of network + Build-depends: network >= 2.2.0.1 && < 2.3 + else + Build-depends: network >= 2.2.0.1 && < 2.6 + build-tools: ghc >= 6.10 && < 7.10 if flag(warn-as-error) @@ -116,30 +130,35 @@ other-modules: Httpd - -- note: version constraints are inherited from HTTP library stanza + -- note: version constraints for dependencies shared with the library + -- should be the same build-depends: HTTP, - HUnit, - httpd-shed, - mtl >= 2.0 && < 2.3, - bytestring >= 0.9 && < 0.11, - case-insensitive >= 0.4 && < 1.3, - deepseq >= 1.3 && < 1.4, - http-types >= 0.6 && < 0.9, - wai >= 1.2 && < 2.2, - warp >= 1.2 && < 2.2, - pureMD5 >= 2.1 && < 2.2, - base >= 2 && < 4.8, - network, - split >= 0.1 && < 0.3, - test-framework, - test-framework-hunit + HUnit >= 1.2.0.1 && < 1.3, + httpd-shed >= 0.4 && < 0.5, + mtl >= 1.1.0.0 && < 2.3, + bytestring >= 0.9.1.3 && < 0.11, + deepseq >= 1.3.0.0 && < 1.4, + pureMD5 >= 0.2.4 && < 2.2, + base >= 3.0.3.1 && < 4.8, + network >= 2.2.0.1 && < 2.6, + split >= 0.1.3 && < 0.3, + test-framework >= 0.2.0 && < 0.9, + test-framework-hunit >= 0.2.0 && <0.4 - if flag(conduit10) - build-depends: - conduit >= 0.4 && < 1.1 - else + if flag(warp-tests) + CPP-Options: -DWARP_TESTS build-depends: - conduit >= 1.1 && < 1.2, - conduit-extra >= 1.1 && < 1.2 + case-insensitive >= 0.2 && < 1.3, + http-types >= 0.6.1 && < 0.9, + wai >= 1.2.0 && < 2.2, + warp >= 1.2.0 && < 2.2 + + if flag(conduit10) + build-depends: + conduit >= 0.4.0 && < 1.1 + else + build-depends: + conduit >= 1.1 && < 1.2, + conduit-extra >= 1.1 && < 1.2 diff --git a/Network/Browser.hs b/Network/Browser.hs --- a/Network/Browser.hs +++ b/Network/Browser.hs @@ -5,7 +5,7 @@ Copyright : See LICENSE file License : BSD -Maintainer : Ganesh Sittampalam +Maintainer : Ganesh Sittampalam Stability : experimental Portability : non-portable (not tested) diff --git a/Network/BufferType.hs b/Network/BufferType.hs --- a/Network/BufferType.hs +++ b/Network/BufferType.hs @@ -6,7 +6,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP.hs b/Network/HTTP.hs --- a/Network/HTTP.hs +++ b/Network/HTTP.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP/Auth.hs b/Network/HTTP/Auth.hs --- a/Network/HTTP/Auth.hs +++ b/Network/HTTP/Auth.hs @@ -5,7 +5,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP/Base.hs b/Network/HTTP/Base.hs --- a/Network/HTTP/Base.hs +++ b/Network/HTTP/Base.hs @@ -5,7 +5,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP/Cookie.hs b/Network/HTTP/Cookie.hs --- a/Network/HTTP/Cookie.hs +++ b/Network/HTTP/Cookie.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP/HandleStream.hs b/Network/HTTP/HandleStream.hs --- a/Network/HTTP/HandleStream.hs +++ b/Network/HTTP/HandleStream.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP/Headers.hs b/Network/HTTP/Headers.hs --- a/Network/HTTP/Headers.hs +++ b/Network/HTTP/Headers.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP/Proxy.hs b/Network/HTTP/Proxy.hs --- a/Network/HTTP/Proxy.hs +++ b/Network/HTTP/Proxy.hs @@ -5,7 +5,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- @@ -19,9 +19,17 @@ , parseProxy -- :: String -> Maybe Proxy ) where +{- +#if !defined(WIN32) && defined(mingw32_HOST_OS) +#define WIN32 1 +#endif +-} + import Control.Monad ( when, mplus, join, liftM2) +#if defined(WIN32) import Network.HTTP.Base ( catchIO ) +#endif import Network.HTTP.Utils ( dropWhileTail, chopAtDelim ) import Network.HTTP.Auth import Network.URI diff --git a/Network/HTTP/Stream.hs b/Network/HTTP/Stream.hs --- a/Network/HTTP/Stream.hs +++ b/Network/HTTP/Stream.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/HTTP/Utils.hs b/Network/HTTP/Utils.hs --- a/Network/HTTP/Utils.hs +++ b/Network/HTTP/Utils.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/Stream.hs b/Network/Stream.hs --- a/Network/Stream.hs +++ b/Network/Stream.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/StreamDebugger.hs b/Network/StreamDebugger.hs --- a/Network/StreamDebugger.hs +++ b/Network/StreamDebugger.hs @@ -4,7 +4,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/StreamSocket.hs b/Network/StreamSocket.hs --- a/Network/StreamSocket.hs +++ b/Network/StreamSocket.hs @@ -5,7 +5,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/Network/TCP.hs b/Network/TCP.hs --- a/Network/TCP.hs +++ b/Network/TCP.hs @@ -5,7 +5,7 @@ -- Copyright : See LICENSE file -- License : BSD -- --- Maintainer : Ganesh Sittampalam +-- Maintainer : Ganesh Sittampalam -- Stability : experimental -- Portability : non-portable (not tested) -- diff --git a/test/Httpd.hs b/test/Httpd.hs --- a/test/Httpd.hs +++ b/test/Httpd.hs @@ -4,7 +4,10 @@ ( Request, Response, Server , mkResponse , reqMethod, reqURI, reqHeaders, reqBody - , shed, warp + , shed +#ifdef WARP_TESTS + , warp +#endif ) where @@ -12,11 +15,13 @@ import Control.Arrow ( (***) ) import Control.DeepSeq import Control.Monad -import Control.Monad.Trans ( lift ) +import Control.Monad.Trans ( liftIO ) import Data.ByteString as B ( empty, concat, length, ByteString ) import Data.ByteString.Char8 as BC ( pack, unpack ) import Data.ByteString.Lazy.Char8 as BLC ( pack ) +#ifdef WARP_TESTS import qualified Data.CaseInsensitive as CI ( mk, original ) +#endif import Data.Maybe ( fromJust ) import Network.URI ( URI, parseRelativeReference ) @@ -24,7 +29,7 @@ ( Request, Response(Response), initServer , reqMethod, reqURI, reqHeaders, reqBody ) - +#ifdef WARP_TESTS import qualified Data.Conduit.Lazy as Warp ( lazyConsume ) import qualified Network.HTTP.Types as Warp @@ -34,6 +39,7 @@ , responseLBS ) import qualified Network.Wai.Handler.Warp as Warp ( run ) +#endif data Request = Request { @@ -80,11 +86,12 @@ rnf = rnf . B.length #endif +#ifdef WARP_TESTS warp :: Server warp port handler = Warp.run port $ \warpRequest -> do request <- requestFromWarp warpRequest - response <- handler request + response <- liftIO $ handler request return (responseToWarp response) where responseToWarp (Response status hdrs body) = @@ -108,3 +115,4 @@ reqHeaders = map headerFromWarp (Warp.requestHeaders request), reqBody = BC.unpack (B.concat body) } +#endif diff --git a/test/httpTests.hs b/test/httpTests.hs --- a/test/httpTests.hs +++ b/test/httpTests.hs @@ -1,4 +1,4 @@ -{-# LANGUAGE ImplicitParams, ViewPatterns, NoMonomorphismRestriction #-} +{-# LANGUAGE ImplicitParams, ViewPatterns, NoMonomorphismRestriction, CPP #-} import Control.Concurrent import Control.Applicative ((<$)) @@ -423,7 +423,7 @@ -- first bits of result text from haskell.org (just to give some representative text) haskellOrgText = "\ -\\ +\\t\ \\t\ \\t\t\ \\t\t\t\t" @@ -614,7 +614,12 @@ main = do args <- getArgs - let servers = [("httpd-shed", Httpd.shed), ("warp", Httpd.warp)] + let servers = + [ ("httpd-shed", Httpd.shed) +#ifdef WARP_TESTS + , ("warp", Httpd.warp) +#endif + ] basePortNum, altPortNum :: Int basePortNum = 5812 altPortNum = 80