diff options
| -rw-r--r-- | Utility/WebApp.hs | 9 | ||||
| -rw-r--r-- | doc/bugs/SanityCheckerStartup_crashed.mdwn | 2 |
2 files changed, 10 insertions, 1 deletions
diff --git a/Utility/WebApp.hs b/Utility/WebApp.hs index 1db7fcf25..6af324e51 100644 --- a/Utility/WebApp.hs +++ b/Utility/WebApp.hs @@ -97,7 +97,14 @@ fixSockAddr addr = addr -- disable buggy sloworis attack prevention code webAppSettings :: Settings -webAppSettings = setTimeout (30 * 60) defaultSettings + +#if MIN_VERSION_warp(2,1,0) +webAppSettings = setTimeout halfhour defaultSettings +#else +webAppSettings = defaultSettings { settingsTimeout = halfhour } +#endif + where + halfhour = 30 * 60 {- Binds to a local socket, or if specified, to a socket on the specified - hostname or address. Selects any free port, unless the hostname ends with diff --git a/doc/bugs/SanityCheckerStartup_crashed.mdwn b/doc/bugs/SanityCheckerStartup_crashed.mdwn index 5ec5b9a47..65a9beb65 100644 --- a/doc/bugs/SanityCheckerStartup_crashed.mdwn +++ b/doc/bugs/SanityCheckerStartup_crashed.mdwn @@ -24,3 +24,5 @@ Precompiled 5.20140530 on Arch Linux x86_64 (git-annex-bin package from the AUR) ### Please provide any additional information below. The crash has not caused any real problem for me that I'm aware of. I'm just reporting it because the error message looks a little scary. + +> [[dup|done]] --[[Joey]] |