Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package ghc-warp for openSUSE:Factory 
checked in at 2022-02-11 23:09:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ghc-warp (Old)
 and      /work/SRC/openSUSE:Factory/.ghc-warp.new.1956 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "ghc-warp"

Fri Feb 11 23:09:59 2022 rev:10 rq:953562 version:3.3.19

Changes:
--------
--- /work/SRC/openSUSE:Factory/ghc-warp/ghc-warp.changes        2021-12-19 
17:35:09.468295423 +0100
+++ /work/SRC/openSUSE:Factory/.ghc-warp.new.1956/ghc-warp.changes      
2022-02-11 23:12:00.999398407 +0100
@@ -1,0 +2,9 @@
+Wed Feb  2 04:02:02 UTC 2022 - Peter Simons <[email protected]>
+
+- Update warp to version 3.3.19.
+  ## 3.3.19
+
+  * Allowing the eMFILE exception in acceptNewConnection.
+    [#831](https://github.com/yesodweb/wai/pull/831)
+
+-------------------------------------------------------------------

Old:
----
  warp-3.3.18.tar.gz

New:
----
  warp-3.3.19.tar.gz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ ghc-warp.spec ++++++
--- /var/tmp/diff_new_pack.fbHv0d/_old  2022-02-11 23:12:01.451399714 +0100
+++ /var/tmp/diff_new_pack.fbHv0d/_new  2022-02-11 23:12:01.455399725 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package ghc-warp
 #
-# Copyright (c) 2021 SUSE LLC
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -19,7 +19,7 @@
 %global pkg_name warp
 %bcond_with tests
 Name:           ghc-%{pkg_name}
-Version:        3.3.18
+Version:        3.3.19
 Release:        0
 Summary:        A fast, light-weight web server for WAI applications
 License:        MIT

++++++ warp-3.3.18.tar.gz -> warp-3.3.19.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/warp-3.3.18/ChangeLog.md new/warp-3.3.19/ChangeLog.md
--- old/warp-3.3.18/ChangeLog.md        2001-09-09 03:46:40.000000000 +0200
+++ new/warp-3.3.19/ChangeLog.md        2001-09-09 03:46:40.000000000 +0200
@@ -1,5 +1,10 @@
 # ChangeLog for warp
 
+## 3.3.19
+
+* Allowing the eMFILE exception in acceptNewConnection.
+  [#831](https://github.com/yesodweb/wai/pull/831)
+
 ## 3.3.18
 
 * Tidy up HashMap and MultiMap [#864](https://github.com/yesodweb/wai/pull/864)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/warp-3.3.18/Network/Wai/Handler/Warp/Run.hs 
new/warp-3.3.19/Network/Wai/Handler/Warp/Run.hs
--- old/warp-3.3.18/Network/Wai/Handler/Warp/Run.hs     2001-09-09 
03:46:40.000000000 +0200
+++ new/warp-3.3.19/Network/Wai/Handler/Warp/Run.hs     2001-09-09 
03:46:40.000000000 +0200
@@ -15,7 +15,7 @@
 import qualified Data.ByteString as S
 import Data.IORef (newIORef, readIORef)
 import Data.Streaming.Network (bindPortTCP)
-import Foreign.C.Error (Errno(..), eCONNABORTED)
+import Foreign.C.Error (Errno(..), eCONNABORTED, eMFILE)
 import GHC.IO.Exception (IOException(..), IOErrorType(..))
 import Network.Socket (Socket, close, accept, withSocketsDo, SockAddr, 
setSocketOption, SocketOption(..))
 #if MIN_VERSION_network(3,1,1)
@@ -269,9 +269,11 @@
         case ex of
             Right x -> return $ Just x
             Left e -> do
-                let eConnAborted = getErrno eCONNABORTED
-                    getErrno (Errno cInt) = cInt
-                if ioe_errno e == Just eConnAborted
+                let getErrno (Errno cInt) = cInt
+                    eConnAborted = getErrno eCONNABORTED
+                    eMfile = getErrno eMFILE
+                    merrno = ioe_errno e
+                if merrno == Just eConnAborted || merrno == Just eMfile
                     then acceptNewConnection
                     else do
                         settingsOnException set Nothing $ toException e
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/warp-3.3.18/Network/Wai/Handler/Warp.hs 
new/warp-3.3.19/Network/Wai/Handler/Warp.hs
--- old/warp-3.3.18/Network/Wai/Handler/Warp.hs 2001-09-09 03:46:40.000000000 
+0200
+++ new/warp-3.3.19/Network/Wai/Handler/Warp.hs 2001-09-09 03:46:40.000000000 
+0200
@@ -312,7 +312,7 @@
 --
 -- Note that by default, the graceful shutdown mode lasts indefinitely
 -- (see 'setGracefulShutdownTimeout'). If you install a signal handler as 
above,
--- upon receiving that signal, the custon shutdown action will run /and/ all
+-- upon receiving that signal, the custom shutdown action will run /and/ all
 -- outstanding requests will be handled.
 --
 -- You may instead prefer to do one or both of the following:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/warp-3.3.18/warp.cabal new/warp-3.3.19/warp.cabal
--- old/warp-3.3.18/warp.cabal  2001-09-09 03:46:40.000000000 +0200
+++ new/warp-3.3.19/warp.cabal  2001-09-09 03:46:40.000000000 +0200
@@ -1,5 +1,5 @@
 Name:                warp
-Version:             3.3.18
+Version:             3.3.19
 Synopsis:            A fast, light-weight web server for WAI applications.
 License:             MIT
 License-file:        LICENSE

Reply via email to