on master help sign in
Move exception handling to top of thread (fixes #613)
35ef1caMichael Snoyman
warp/ChangeLog.md+5
@@ -1,3 +1,8 @@
1+## 3.2.11.1
2+
3+* Move exception handling to top of thread (fixes
4+ [#613](https://github.com/yesodweb/wai/issues/613))
5+
1## 3.2.11
6## 3.2.11
2
7
3* Fixing 10 HTTP2 bugs pointed out by h2spec v2.
8* Fixing 10 HTTP2 bugs pointed out by h2spec v2.
warp/Network/Wai/Handler/Warp/Run.hs+4−4
@@ -264,6 +264,10 @@ fork :: Settings
264 -> InternalInfo0
264 -> InternalInfo0
265 -> IO ()
265 -> IO ()
266fork set mkConn addr app counter ii0 = settingsFork set $ \ unmask ->
266fork set mkConn addr app counter ii0 = settingsFork set $ \ unmask ->
267+ -- Call the user-supplied on exception code if any
268+ -- exceptions are thrown.
269+ handle (settingsOnException set Nothing) .
270+
267 -- Allocate a new IORef indicating whether the connection has been
271 -- Allocate a new IORef indicating whether the connection has been
268 -- closed, to avoid double-freeing a connection
272 -- closed, to avoid double-freeing a connection
269 withClosedRef $ \ref ->
273 withClosedRef $ \ref ->
@@ -292,10 +296,6 @@ fork set mkConn addr app counter ii0 = settingsFork set $ \ unmask ->
292 -- in the case of all exceptions, so it is safe to one
296 -- in the case of all exceptions, so it is safe to one
293 -- again allow async exceptions.
297 -- again allow async exceptions.
294 in unmask .
298 in unmask .
295− -- Call the user-supplied on exception code if any
296− -- exceptions are thrown.
297− handle (settingsOnException set Nothing) .
298−
299 -- Call the user-supplied code for connection open and close events
299 -- Call the user-supplied code for connection open and close events
300 bracket (onOpen addr) (onClose addr) $ \goingon ->
300 bracket (onOpen addr) (onClose addr) $ \goingon ->
301
301
warp/warp.cabal+1−1
@@ -1,5 +1,5 @@
1Name: warp
1Name: warp
2−Version: 3.2.11
2+Version: 3.2.11.1
3Synopsis: A fast, light-weight web server for WAI applications.
3Synopsis: A fast, light-weight web server for WAI applications.
4License: MIT
4License: MIT
5License-file: LICENSE
5License-file: LICENSE