Merge pull request #247 from httprb/zanker/fixednil-parser

Fixed exceptionless NIO handling for EOF

CHANGES.md

@@ -1,3 +1,6 @@
+## 0.9.2 (2015-08-18)
+* Fixed exceptionless NIO EOF handling. (@zanker)
+
 ## 0.9.1 (2015-08-14)
 
 * Fix params special-chars escaping. See #246. (@ixti)

lib/http/connection.rb

@@ -208,9 +208,11 @@ def read_more(size)
       return if @parser.finished?
 
       value = @socket.readpartial(size)
-      @parser << value unless value == :eof
-
-      nil
+      if value == :eof
+        :eof
+      elsif value
+        @parser << value
+      end
     end
   end
 end

lib/http/timeout/global.rb

@@ -76,7 +76,11 @@ def readpartial(size)
 
           loop do
             result = socket.read_nonblock(size, :exception => false)
-            break result unless result == :wait_readable
+            if result.nil?
+              return :eof
+            elsif result != :wait_readable
+              return result
+            end
 
             IO.select([socket], nil, nil, time_left)
             log_time

lib/http/timeout/per_operation.rb

@@ -55,7 +55,11 @@ def write(data)
         def readpartial(size)
           loop do
             result = socket.read_nonblock(size, :exception => false)
-            break result unless result == :wait_readable
+            if result.nil?
+              return :eof
+            elsif result != :wait_readable
+              return result
+            end
 
             unless IO.select([socket], nil, nil, read_timeout)
               fail TimeoutError, "Read timed out after #{read_timeout} seconds"

lib/http/version.rb

@@ -1,3 +1,3 @@
 module HTTP
-  VERSION = "0.9.1".freeze
+  VERSION = "0.9.2".freeze
 end