warp 3.3.26 → 3.3.27

raw patch · 3 files changed

+10/−7 lines, 3 files

Files

• ChangeLog.md +5/−0
• Network/Wai/Handler/Warp/Run.hs +4/−6
• warp.cabal +1/−1

@@ -1,5 +1,10 @@ # ChangeLog for warp +## 3.3.27++* Fixing busy loop due to eMFILE+  [#933](https://github.com/yesodweb/wai/pull/933)+ ## 3.3.26  * Using crypton instead of cryptonite.

@@ -13,7 +13,7 @@ import qualified Data.ByteString as S import Data.IORef (newIORef, readIORef) import Data.Streaming.Network (bindPortTCP)-import Foreign.C.Error (Errno(..), eCONNABORTED, eMFILE)+import Foreign.C.Error (Errno(..), eCONNABORTED) import GHC.IO.Exception (IOException(..), IOErrorType(..)) import Network.Socket (Socket, close, withSocketsDo, SockAddr, setSocketOption, SocketOption(..)) #if MIN_VERSION_network(3,1,1)@@ -277,11 +277,9 @@         case ex of             Right x -> return $ Just x             Left e -> do-                let getErrno (Errno cInt) = cInt-                    eConnAborted = getErrno eCONNABORTED-                    eMfile = getErrno eMFILE-                    merrno = ioe_errno e-                if merrno == Just eConnAborted || merrno == Just eMfile+                let eConnAborted = getErrno eCONNABORTED+                    getErrno (Errno cInt) = cInt+                if ioe_errno e == Just eConnAborted                     then acceptNewConnection                     else do                         settingsOnException set Nothing $ toException e

@@ -1,5 +1,5 @@ Name:                warp-Version:             3.3.26+Version:             3.3.27 Synopsis:            A fast, light-weight web server for WAI applications. License:             MIT License-file:        LICENSE