diff options
| author | Nick Lewis <nick@puppetlabs.com> | 2011-08-04 13:40:34 -0700 |
|---|---|---|
| committer | Nick Lewis <nick@puppetlabs.com> | 2011-08-04 13:40:34 -0700 |
| commit | 2185bb2804aeef6b419667951b2157b01404c694 (patch) | |
| tree | cda7fff4d06c7f3607a84b260fd71adfd9704e3b /lib | |
| parent | b85f57cc227df16a6f0beedbd4f10befa55b9b3c (diff) | |
| parent | 711344836aa1e469876fc511be14e8159e61b0b8 (diff) | |
| download | puppet-2185bb2804aeef6b419667951b2157b01404c694.tar.gz puppet-2185bb2804aeef6b419667951b2157b01404c694.tar.xz puppet-2185bb2804aeef6b419667951b2157b01404c694.zip | |
Merge pull request #21 from daniel-pittman/bug/2.7.x/4762-ensure-that-clients-on-the-moon-can-successfully-connect
Bug/2.7.x/4762 ensure that clients on the moon can successfully connect
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/puppet/network/http/webrick.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/puppet/network/http/webrick.rb b/lib/puppet/network/http/webrick.rb index 54bcf30c2..52aec1bf1 100644 --- a/lib/puppet/network/http/webrick.rb +++ b/lib/puppet/network/http/webrick.rb @@ -40,7 +40,7 @@ class Puppet::Network::HTTP::WEBrick @listening = true @thread = Thread.new { @server.start { |sock| - raise "Client disconnected before connection could be established" unless IO.select([sock],nil,nil,0.1) + raise "Client disconnected before connection could be established" unless IO.select([sock],nil,nil,6.2) sock.accept @server.run(sock) } |