Ruby 2.2+ can show "struct tcp_info" as a string via
Socket::Option#inspect, and we can attempt to parse it
out to extract the information we need.
Parsing this string is inefficient, but does not depend on the
ordering of the tcp_info struct.
---
lib/unicorn/http_request.rb | 32 +++++++++++++++++++++++++++++++-
1 file changed, 31 insertions(+), 1 deletion(-)
diff --git a/lib/unicorn/http_request.rb b/lib/unicorn/http_request.rb
index 68bde16..c08097c 100644
--- a/lib/unicorn/http_request.rb
+++ b/lib/unicorn/http_request.rb
@@ -29,6 +29,7 @@ class Unicorn::HttpParser
EMPTY_ARRAY = [].freeze
@@input_class = Unicorn::TeeInput
@@check_client_connection = false
+ @@tcpi_inspect_ok = true
def self.input_class
@@input_class
@@ -127,8 +128,37 @@ def closed_state?(state) # :nodoc:
end
end
else
+
+ # Ruby 2.2+ can show struct tcp_info as a string Socket::Option#inspect.
+ # Not that efficient, but probably still better than doing unnecessary
+ # work after a client gives up.
def check_client_connection(socket) # :nodoc:
- write_http_header(socket)
+ if Unicorn::TCPClient === socket && @@tcpi_inspect_ok
+ opt = socket.getsockopt(:IPPROTO_TCP, :TCP_INFO).inspect
+ if opt =~ /\bstate=(\S+)/
+ @@tcpi_inspect_ok = true
+ raise Errno::EPIPE, "client closed connection".freeze,
+ EMPTY_ARRAY if closed_state_str?($1)
+ else
+ @@tcpi_inspect_ok = false
+ write_http_header(socket)
+ end
+ opt.clear
+ else
+ write_http_header(socket)
+ end
+ end
+
+ def closed_state_str?(state)
+ case state
+ when 'ESTABLISHED'
+ false
+ # not a typo, ruby maps TCP_CLOSE (no 'D') to state=CLOSED (w/ 'D')
+ when 'CLOSE_WAIT', 'TIME_WAIT', 'CLOSED', 'LAST_ACK', 'CLOSING'
+ true
+ else
+ false
+ end
end
end
--
EW
--
unsubscribe: unicorn-public+unsubscr...@bogomips.org
archive: https://bogomips.org/unicorn-public/
