summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThom May <thom@may.lt>2016-07-19 18:22:23 +0100
committerGitHub <noreply@github.com>2016-07-19 18:22:23 +0100
commit1b1bc10628de4e109e3451a90069798ce7a2da98 (patch)
treefadc3bc5f7341fa62a0920f883c465ff51f10377 /lib
parent143edc9f2911737c091c8c87a052ff2f02c05719 (diff)
parente18dac65098b3b6156f1d1d4b64fd97ca93b7ba0 (diff)
downloadchef-zero-1b1bc10628de4e109e3451a90069798ce7a2da98.tar.gz
Merge pull request #138 from kongslund/request-timeout
Increase WEBrick request timeout to 300 seconds. Fixes #137
Diffstat (limited to 'lib')
-rw-r--r--lib/chef_zero/server.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/chef_zero/server.rb b/lib/chef_zero/server.rb
index 9c92652..19744b1 100644
--- a/lib/chef_zero/server.rb
+++ b/lib/chef_zero/server.rb
@@ -284,6 +284,7 @@ module ChefZero
:DoNotListen => true,
:AccessLog => [],
:Logger => WEBrick::Log.new(StringIO.new, 7),
+ :RequestTimeout => 300,
:SSLEnable => options[:ssl],
:SSLOptions => ssl_opts,
:SSLCertName => [ [ 'CN', WEBrick::Utils::getservername ] ],