git.iko.soy/typeable/wai
on master help sign in
fixing typos.
commit023cb4f593d0e35c36cae45a76c5db053d35697d authorKazu Yamamoto <kazu@iij.ad.jp> dateFri 13 Dec 2019, 16:15 (7 years ago) parent1d40f63
3 files changed+18−18
compare with master
unifiedsplit
warp/Network/Wai/Handler/Warp.hs+12−12 warp/Network/Wai/Handler/Warp/Run.hs+2−2 warp/Network/Wai/Handler/Warp/Settings.hs+4−4
warp/Network/Wai/Handler/Warp.hs+12−12
@@ -72,8 +72,8 @@ module Network.Wai.Handler.Warp (
7272 , setLogger
7373 , setServerPushLogger
7474 , setGracefulShutdownTimeout
75− , setGracefulCloseTiemout1
76− , setGracefulCloseTiemout2
75+ , setGracefulCloseTimeout1
76+ , setGracefulCloseTimeout2
7777 -- ** Getters
7878 , getPort
7979 , getHost
@@ -81,8 +81,8 @@ module Network.Wai.Handler.Warp (
8181 , getOnClose
8282 , getOnException
8383 , getGracefulShutdownTimeout
84− , getGracefulCloseTiemout1
85− , getGracefulCloseTiemout2
84+ , getGracefulCloseTimeout1
85+ , getGracefulCloseTimeout2
8686 -- ** Exception handler
8787 , defaultOnException
8888 , defaultShouldDisplayException
@@ -467,27 +467,27 @@ getFileInfo = fromMaybe (\_ -> throwIO (userError "getFileInfo")) . Vault.lookup
467467-- Default: 0.
468468--
469469-- Since 3.3.5
470−setGracefulCloseTiemout1 :: Int -> Settings -> Settings
471−setGracefulCloseTiemout1 x y = y { settingsGracefulCloseTiemout1 = x }
470+setGracefulCloseTimeout1 :: Int -> Settings -> Settings
471+setGracefulCloseTimeout1 x y = y { settingsGracefulCloseTimeout1 = x }
472472
473473-- | A timeout to limit the time (in milliseconds) waiting for
474474-- FIN for HTTP/1.x. 0 means uses immediate close.
475475--
476476-- Since 3.3.5
477−getGracefulCloseTiemout1 :: Settings -> Int
478−getGracefulCloseTiemout1 = settingsGracefulCloseTiemout1
477+getGracefulCloseTimeout1 :: Settings -> Int
478+getGracefulCloseTimeout1 = settingsGracefulCloseTimeout1
479479
480480-- | A timeout to limit the time (in milliseconds) waiting for
481481-- FIN for HTTP/2. 0 means uses immediate close.
482482-- Default: 2000.
483483--
484484-- Since 3.3.5
485−setGracefulCloseTiemout2 :: Int -> Settings -> Settings
486−setGracefulCloseTiemout2 x y = y { settingsGracefulCloseTiemout2 = x }
485+setGracefulCloseTimeout2 :: Int -> Settings -> Settings
486+setGracefulCloseTimeout2 x y = y { settingsGracefulCloseTimeout2 = x }
487487
488488-- | A timeout to limit the time (in milliseconds) waiting for
489489-- FIN for HTTP/2. 0 means uses immediate close.
490490--
491491-- Since 3.3.5
492−getGracefulCloseTiemout2 :: Settings -> Int
493−getGracefulCloseTiemout2 = settingsGracefulCloseTiemout2
492+getGracefulCloseTimeout2 :: Settings -> Int
493+getGracefulCloseTimeout2 = settingsGracefulCloseTimeout2
warp/Network/Wai/Handler/Warp/Run.hs+2−2
@@ -71,8 +71,8 @@ socketConnection set s = do
7171#if MIN_VERSION_network(3,1,1)
7272 , connClose = do
7373 h2 <- readIORef isH2
74− let tm = if h2 then settingsGracefulCloseTiemout2 set
75− else settingsGracefulCloseTiemout1 set
74+ let tm = if h2 then settingsGracefulCloseTimeout2 set
75+ else settingsGracefulCloseTimeout1 set
7676 if tm == 0 then
7777 close s
7878 else
warp/Network/Wai/Handler/Warp/Settings.hs+4−4
@@ -109,13 +109,13 @@ data Settings = Settings
109109 -- a graceful shutdown of the web server.
110110 --
111111 -- Since 3.2.8
112− , settingsGracefulCloseTiemout1 :: Int
112+ , settingsGracefulCloseTimeout1 :: Int
113113 -- ^ A timeout to limit the time (in milliseconds) waiting for
114114 -- FIN for HTTP/1.x. 0 means uses immediate close.
115115 -- Default: 0.
116116 --
117117 -- Since 3.3.5
118− , settingsGracefulCloseTiemout2 :: Int
118+ , settingsGracefulCloseTimeout2 :: Int
119119 -- ^ A timeout to limit the time (in milliseconds) waiting for
120120 -- FIN for HTTP/2. 0 means uses immediate close.
121121 -- Default: 2000.
@@ -157,8 +157,8 @@ defaultSettings = Settings
157157 , settingsLogger = \_ _ _ -> return ()
158158 , settingsServerPushLogger = \_ _ _ -> return ()
159159 , settingsGracefulShutdownTimeout = Nothing
160− , settingsGracefulCloseTiemout1 = 0
161− , settingsGracefulCloseTiemout2 = 2000
160+ , settingsGracefulCloseTimeout1 = 0
161+ , settingsGracefulCloseTimeout2 = 2000
162162 }
163163
164164-- | Apply the logic provided by 'defaultOnException' to determine if an