From e68ea6a3b945d6ce92e514e665bf9624949017fb Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sun, 7 Apr 2013 18:00:02 +0300
Subject: [PATCH] Disable yesod devel timeout by default

---
 yesod-bin/Devel.hs | 5 ++++-
 yesod-bin/main.hs  | 4 ++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/yesod-bin/Devel.hs b/yesod-bin/Devel.hs
index 7958ac7e..378d9575 100644
--- a/yesod-bin/Devel.hs
+++ b/yesod-bin/Devel.hs
@@ -123,7 +123,10 @@ reverseProxy opts iappPort = do
                     return $ Right $ ProxyDest "127.0.0.1" appPort)
                 def
                     { wpsOnExc = onExc
-                    , wpsTimeout = Just (1000000 * proxyTimeout opts)
+                    , wpsTimeout =
+                        if proxyTimeout opts == 0
+                            then Nothing
+                            else Just (1000000 * proxyTimeout opts)
                     }
                 manager
             putStrLn "Reverse proxy stopped, but it shouldn't"
diff --git a/yesod-bin/main.hs b/yesod-bin/main.hs
index e8c5637e..df72e2a1 100755
--- a/yesod-bin/main.hs
+++ b/yesod-bin/main.hs
@@ -148,8 +148,8 @@ develOptions = Devel <$> switch ( long "disable-api"  <> short 'd'
                      <*> extraCabalArgs
                      <*> option ( long "port" <> short 'p' <> value 3000 <> metavar "N"
                             <> help "Devel server listening port" )
-                     <*> option ( long "proxy-timeout" <> short 'x' <> value 10 <> metavar "N"
-                            <> help "Devel server timeout before returning 'not ready' message (in seconds)" )
+                     <*> option ( long "proxy-timeout" <> short 'x' <> value 0 <> metavar "N"
+                            <> help "Devel server timeout before returning 'not ready' message (in seconds, 0 for none)" )
 
 extraCabalArgs :: Parser [String]
 extraCabalArgs = many (strOption ( long "extra-cabal-arg" <> short 'e' <> metavar "ARG"