ngx-export 0.2.1.0 → 0.2.2.0

raw patch · 2 files changed

+8/−5 lines, 2 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• NgxExport.hs +7/−4
• ngx-export.cabal +1/−1

@@ -24,6 +24,7 @@ import           System.IO.Error import           System.Posix.IO import           Control.Monad+import           Control.Exception hiding (Handler) import           Control.Concurrent.Async import           Data.Maybe import qualified Data.ByteString as B@@ -121,7 +122,7 @@ instance Storable NgxStrType where     alignment _ = max (alignment (undefined :: CSize))                       (alignment (undefined :: CString))-    sizeOf = (* 2) . alignment  -- must always be correct for+    sizeOf = (2 *) . alignment  -- must always be correct for                                 -- aligned struct ngx_str_t     peek p = do         n <- peekByteOff p 0@@ -224,9 +225,10 @@     CInt -> CUInt -> Ptr CString -> Ptr CInt -> Ptr CUInt -> IO () ioyY (IOYY f) x (fromIntegral -> n) (fromIntegral -> fd)         ((/= 0) -> fstRun) p pl r =-    void . async $ do+    void . async $+    (do     s <- (Right <$> (B.unsafePackCStringLen (x, n) >>= flip f fstRun))-        `catchIOError` (return . Left . show)+        `catch` \e -> return $ Left $ show (e :: SomeException)     either         (\s -> do             (x, fromIntegral -> l) <- newCStringLen s@@ -241,7 +243,8 @@             poke pl l             poke r 0         ) s-    (fdWrite fd "0" >> closeFd fd) `catchIOError` const (return ())+    )+    `finally` ((fdWrite fd "0" >> closeFd fd) `catchIOError` const (return ()))  bS :: NgxExport -> CString -> CInt -> IO CUInt bS (BS f) x (fromIntegral -> n) =

@@ -1,5 +1,5 @@ name:                ngx-export-version:             0.2.1.0+version:             0.2.2.0 synopsis:            Helper module for Nginx haskell module description:         Helper module for         <http://github.com/lyokha/nginx-haskell-module Nginx haskell module>