On OpenBSD, getsockopt(2) does not support TCP_INFO. With the current code,
this results in a 500 for all clients if check_client_connection is enabled
on OpenBSD.
This patch rescues SocketError on the first getsockopt call, and
if SocketError is raised, it doesn't check in the future. This
should be the same behavior as if TCP_INFO was supported but
inspect did not return a string in the expected format.
---
lib/unicorn/http_request.rb | 18 ++++++++++++++----
1 file changed, 14 insertions(+), 4 deletions(-)
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 7253497..6dc0aa7 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -29,7 +29,7 @@ class Unicorn::HttpParser
EMPTY_ARRAY = [].freeze
@@input_class = Unicorn::TeeInput
@@check_client_connection = false
- @@tcpi_inspect_ok = true
+ @@tcpi_inspect_ok = nil
def self.input_class
@@input_class
@@ -154,10 +154,20 @@ def closed_state?(state) # :nodoc:
# Not that efficient, but probably still better than doing unnecessary
# work after a client gives up.
def check_client_connection(socket) # :nodoc:
- if Unicorn::TCPClient === socket && @@tcpi_inspect_ok
- opt = socket.getsockopt(:IPPROTO_TCP, :TCP_INFO).inspect
- if opt =~ /\bstate=(\S+)/
+ if Unicorn::TCPClient === socket && @@tcpi_inspect_ok != false
+ if @@tcpi_inspect_ok
+ opt = socket.getsockopt(:IPPROTO_TCP, :TCP_INFO).inspect
+ else
@@tcpi_inspect_ok = true
+ opt = begin
+ socket.getsockopt(:IPPROTO_TCP, :TCP_INFO)
+ rescue SocketError
+ @@tcpi_inspect_ok = false
+ return write_http_header(socket)
+ end.inspect
+ end
+
+ if opt =~ /\bstate=(\S+)/
raise Errno::EPIPE, "client closed connection".freeze,
EMPTY_ARRAY if closed_state_str?($1)
else
--
2.11.0
--
unsubscribe: [email protected]
archive: https://bogomips.org/unicorn-public/
