From 49bb21c176deb97904490409f15708f6a011008a Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 6 Aug 2016 10:35:59 +0000 Subject: openssl_client: avoid undefined SSL_write behavior Sometimes apps may trigger zero-byte chunks in the response body for whatever reason. We should maintain consistent behavior with the rest of kgio; and Ruby OpenSSL::SSL::SSLSocket should maintain consistent behavior with the core IO class: https://bugs.ruby-lang.org/issues/12660 --- lib/yahns/openssl_client.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'lib/yahns/openssl_client.rb') diff --git a/lib/yahns/openssl_client.rb b/lib/yahns/openssl_client.rb index 439bc75..0d376bd 100644 --- a/lib/yahns/openssl_client.rb +++ b/lib/yahns/openssl_client.rb @@ -38,12 +38,14 @@ module Yahns::OpenSSLClient # :nodoc: end def kgio_trywrite(buf) + len = buf.bytesize + return if len == 0 buf = @ssl_blocked = buf.dup case rv = @ssl.write_nonblock(buf, exception: false) when :wait_readable, :wait_writable return rv # do not clear ssl_blocked when Integer - rv = buf.bytesize == rv ? nil : buf.byteslice(rv, buf.bytesize - rv) + rv = len == rv ? nil : buf.byteslice(rv, len - rv) end @ssl_blocked = nil rv -- cgit v1.2.3-24-ge0c7