snap-server 1.0.1.0 → 1.0.1.1

raw patch · 3 files changed

+7/−6 lines, 3 filesdep ~basedep ~directorydep ~vectorPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: base, directory, vector

API changes (from Hackage documentation)

Files

• snap-server.cabal +1/−1
• src/System/SendFile/FreeBSD.hsc +3/−1
• test/System/SendFile/Tests.hs +3/−4

@@ -1,5 +1,5 @@ name:           snap-server-version:        1.0.1.0+version:        1.0.1.1 synopsis:       A web server for the Snap Framework description:   Snap is a simple and fast web development framework and server written in

@@ -12,7 +12,7 @@ import           Control.Concurrent    (threadWaitWrite) import           Data.Int import           Data.Word-import           Foreign.C.Error       (throwErrnoIfMinus1RetryMayBlock)+import           Foreign.C.Error       (throwErrnoIfMinus1RetryMayBlock_) #if __GLASGOW_HASKELL__ >= 703 import           Foreign.C.Types       (CInt (..), CSize (..)) #else@@ -31,6 +31,8 @@  ------------------------------------------------------------------------------ sendFile :: Fd -> Fd -> Word64 -> Word64 -> IO Int64+sendFile = sendFileImpl c_sendfile_freebsd threadWaitWrite+{-# INLINE sendFile #-}   ------------------------------------------------------------------------------

@@ -148,13 +148,13 @@       _sf_fd1 :: Fd     , _sf_fd2 :: Fd     , _sf_off :: COff-    , _sf_sz  :: COff+    , _sf_sz  :: CSize     }   deriving (Eq, Show, Ord)   -------------------------------------------------------------------------------sendFileMockSendFunc :: MVar [IO CSize]          -- ^ sample outputs+sendFileMockSendFunc :: MVar [IO CInt]          -- ^ sample outputs                      -> MVar [SendFileCallLog]   -- ^ log of calls                      -> Fd -> Fd -> COff -> CSize -> Ptr () -> Ptr COff                      -> CInt -> IO CInt@@ -162,8 +162,7 @@     modifyMVar_ callLog (return . (++ [SendFileCallLog fd1 fd2 off clen]))     x <- modifyMVar sampleData $ \xs -> return $!             if null xs then ([], return Nothing) else (tail xs, fmap Just $! head xs)-    x >>= maybe (c_set_errno eCONNRESET >> return (-1))-                (\l -> poke pbytes (fromIntegral l) >> return 0)+    x >>= maybe (c_set_errno eCONNRESET >> return (-1)) return   #elif defined(OSX)