http 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 42fd5a5fec6c2e6448908c9578bf27175a291933
-  data.tar.gz: 03a31ca5372bf0e9e2c5dcae9a8e06d9a7e38c56
+  metadata.gz: f5e1c6e74ac078db494c4b2196a43018b75db1dc
+  data.tar.gz: 8bf04adb251ff46dc31190ce865736c13c7317a2
 SHA512:
-  metadata.gz: abc5ea24f0d2eb18022994003ab416bfddaa8976fc58bb41169eac32431b70838255d9956d710581da1ec844e0c85243d7fa937c0603122a8d61211b47bc80ae
-  data.tar.gz: 4b25eb0dac0ad59a5688ec5298253975c8ff186dde6d181cb8276e8e2aeafe235305f3c1717bc8c4171a551bf965215c4e0f05cda30dc79cd1bd03f6a3aa204f
+  metadata.gz: 702c1c5e63d582319859b9f6da99d4192141f6162237e593bb50e70e87cb0a54e0b6bcc43bfedce1e02cb1b7cc2c7cfbf18fcab903cf99a5b4f6362419a98d44
+  data.tar.gz: 44e4070afc9aeae5b0ba5c5f6c74d87df2c5a5656175e26d3cc485418316e84ec23c36dccd7e9b4d2a9595b09d117a1bdff0714cca432f337cc770b3840da222

data/CHANGES.md

@@ -1,3 +1,11 @@
+## 3.2.0 (2018-04-22)
+
+This vresion backports one change we missed to backport in previous release:
+
+* Reduce memory usage when reading response body
+  ([@janko-m])
+
+
 ## 3.1.0 (2018-04-22)
 
 This version backports some of the fixes and improvements made to development

data/lib/http/connection.rb

@@ -35,6 +35,7 @@ module HTTP
       @pending_request      = false
       @pending_response     = false
       @failed_proxy_connect = false
+      @buffer               = "".b
 
       @parser = Response::Parser.new
 
@@ -212,7 +213,7 @@ module HTTP
     def read_more(size)
       return if @parser.finished?
 
-      value = @socket.readpartial(size)
+      value = @socket.readpartial(size, @buffer)
       if value == :eof
         @parser << ""
         :eof

data/lib/http/timeout/global.rb

@@ -48,8 +48,8 @@ module HTTP
       end
 
       # Read from the socket
-      def readpartial(size)
-        perform_io { read_nonblock(size) }
+      def readpartial(size, buffer = nil)
+        perform_io { read_nonblock(size, buffer) }
       end
 
       # Write to the socket
@@ -62,16 +62,16 @@ module HTTP
       private
 
       if RUBY_VERSION < "2.1.0"
-        def read_nonblock(size)
-          @socket.read_nonblock(size)
+        def read_nonblock(size, buffer = nil)
+          @socket.read_nonblock(size, buffer)
         end
 
         def write_nonblock(data)
           @socket.write_nonblock(data)
         end
       else
-        def read_nonblock(size)
-          @socket.read_nonblock(size, :exception => false)
+        def read_nonblock(size, buffer = nil)
+          @socket.read_nonblock(size, buffer, :exception => false)
         end
 
         def write_nonblock(data)

data/lib/http/timeout/null.rb

@@ -41,8 +41,8 @@ module HTTP
       end
 
       # Read from the socket
-      def readpartial(size)
-        @socket.readpartial(size)
+      def readpartial(size, buffer = nil)
+        @socket.readpartial(size, buffer)
       rescue EOFError
         :eof
       end

data/lib/http/timeout/per_operation.rb

@@ -39,9 +39,9 @@ module HTTP
       # NIO with exceptions
       if RUBY_VERSION < "2.1.0"
         # Read data from the socket
-        def readpartial(size)
+        def readpartial(size, buffer = nil)
           rescue_readable do
-            @socket.read_nonblock(size)
+            @socket.read_nonblock(size, buffer)
           end
         rescue EOFError
           :eof
@@ -59,10 +59,10 @@ module HTTP
       # NIO without exceptions
       else
         # Read data from the socket
-        def readpartial(size)
+        def readpartial(size, buffer = nil)
           timeout = false
           loop do
-            result = @socket.read_nonblock(size, :exception => false)
+            result = @socket.read_nonblock(size, buffer, :exception => false)
 
             return :eof   if result.nil?
             return result if result != :wait_readable

data/lib/http/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module HTTP
-  VERSION = "3.1.0"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Tony Arcieri