summaryrefslogtreecommitdiff
path: root/lib/webrick
diff options
context:
space:
mode:
Diffstat (limited to 'lib/webrick')
-rw-r--r--lib/webrick/config.rb1
-rw-r--r--lib/webrick/server.rb10
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/webrick/config.rb b/lib/webrick/config.rb
index 10db6e0944..121669c13a 100644
--- a/lib/webrick/config.rb
+++ b/lib/webrick/config.rb
@@ -34,6 +34,7 @@ module WEBrick
:StopCallback => nil,
:AcceptCallback => nil,
:DoNotReverseLookup => nil,
+ :ShutdownSocketWithoutClose => false,
}
# for HTTPServer, HTTPRequest, HTTPResponse ...
diff --git a/lib/webrick/server.rb b/lib/webrick/server.rb
index 3adbded5fa..54375d2e7d 100644
--- a/lib/webrick/server.rb
+++ b/lib/webrick/server.rb
@@ -129,7 +129,10 @@ module WEBrick
addr = s.addr
@logger.debug("close TCPSocket(#{addr[2]}, #{addr[1]})")
end
- s.close
+ s.shutdown
+ unless @config[:ShutdownSocketWithoutClose]
+ s.close
+ end
}
@listeners.clear
end
@@ -147,9 +150,8 @@ module WEBrick
sock.sync = true
Utils::set_non_blocking(sock)
Utils::set_close_on_exec(sock)
- rescue Errno::ECONNRESET, Errno::ECONNABORTED, Errno::EPROTO => ex
- # TCP connection was established but RST segment was sent
- # from peer before calling TCPServer#accept.
+ rescue Errno::ECONNRESET, Errno::ECONNABORTED,
+ Errno::EPROTO, Errno::EINVAL => ex
rescue Exception => ex
msg = "#{ex.class}: #{ex.message}\n\t#{ex.backtrace[0]}"
@logger.error msg