Merge pull request #644 from nerdrew/nerdrew/ssl-wait-writable

handle IO::WaitWritable

Author: djanowski

lib/redis/connection/ruby.rb

@@ -27,8 +27,12 @@ module SocketMixin
       CRLF = "\r\n".freeze
 
       # Exceptions raised during non-blocking I/O ops that require retrying the op
-      NBIO_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
-      NBIO_EXCEPTIONS << IO::WaitReadable if RUBY_VERSION >= "1.9.3"
+      NBIO_READ_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
+      NBIO_WRITE_EXCEPTIONS = [Errno::EWOULDBLOCK, Errno::EAGAIN]
+      if RUBY_VERSION >= "1.9.3"
+        NBIO_READ_EXCEPTIONS << IO::WaitReadable
+        NBIO_WRITE_EXCEPTIONS << IO::WaitWritable
+      end
 
       def initialize(*args)
         super(*args)
@@ -78,12 +82,18 @@ def _read_from_socket(nbytes)
         begin
           read_nonblock(nbytes)
 
-        rescue *NBIO_EXCEPTIONS
+        rescue *NBIO_READ_EXCEPTIONS
           if IO.select([self], nil, nil, @timeout)
             retry
           else
             raise Redis::TimeoutError
           end
+        rescue *NBIO_WRITE_EXCEPTIONS
+          if IO.select(nil, [self], nil, @timeout)
+            retry
+          else
+            raise Redis::TimeoutError
+          end
         end
 
       rescue EOFError
@@ -94,7 +104,13 @@ def _write_to_socket(data)
         begin
           write_nonblock(data)
 
-        rescue *NBIO_EXCEPTIONS
+        rescue *NBIO_READ_EXCEPTIONS
+          if IO.select([self], nil, nil, @write_timeout)
+            retry
+          else
+            raise Redis::TimeoutError
+          end
+        rescue *NBIO_WRITE_EXCEPTIONS
           if IO.select(nil, [self], nil, @write_timeout)
             retry
           else

test/ssl_test.rb

@@ -25,6 +25,13 @@ def test_unverified_ssl_connection
         end
       end
 
+      def test_ssl_blocking
+        RedisMock.start({}, ssl_server_opts("trusted")) do |port|
+          redis = Redis.new(:port => port, :ssl => true, :ssl_params => { :ca_file => ssl_ca_file })
+          assert_equal redis.set("boom", "a" * 10_000_000), "OK"
+        end
+      end
+
     end
 
     driver(:hiredis, :synchrony) do