on master help sign in
Merge pull request #322 from tekul/master

Fix some warp comment typos

commit86aff5a60374ec5fb3d7085b46ccaba105cda3f6 authorMichael Snoyman <michael@snoyman.com> dateMon 5 Jan 2015, 17:16 (12 years ago) parente947f4c3805a01
2 files changed+3−3
warp/Network/Wai/Handler/Warp.hs+1−1 warp/Network/Wai/Handler/Warp/Run.hs+2−2
warp/Network/Wai/Handler/Warp.hs+1−1
@@ -122,7 +122,7 @@ setHost x y = y { settingsHost = x }
122122
123123-- | What to do with exceptions thrown by either the application or server.
124124-- Default: ignore server-generated exceptions (see 'InvalidRequest') and print
125−-- application-generated applications to stderr.
125+-- application-generated exceptions to stderr.
126126--
127127-- Since 2.1.0
128128setOnException :: (Maybe Request -> SomeException -> IO ()) -> Settings -> Settings
warp/Network/Wai/Handler/Warp/Run.hs+2−2
@@ -89,7 +89,7 @@ runSettings set app = withSocketsDo $
8989-- 'serverPort' record.
9090--
9191-- When the listen socket in the second argument is closed, all live
92−-- connections are gracefully shut-downed.
92+-- connections are gracefully shut down.
9393runSettingsSocket :: Settings -> Socket -> Application -> IO ()
9494runSettingsSocket set socket app = do
9595 settingsInstallShutdownHandler set closeListenSocket
@@ -259,7 +259,7 @@ fork set mkConn addr app dc fc tm counter = settingsFork set $ \ unmask ->
259259 bracket (onOpen addr) (onClose addr) $ \goingon ->
260260
261261 -- Actually serve this connection.
262− -- onnClose above ensures the termination of the connection.
262+ -- bracket with closeConn above ensures the connection is closed.
263263 when goingon $ serveConnection conn ii addr isSecure' set app
264264 where
265265 closeConn (conn, _isSecure) = connClose conn