excon 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fea894ca265007d66dbec2fcd785d793fff59080175f64c268208d225e32a70
-  data.tar.gz: bdfe0c227062cc7560e5c8ca9ec4b5dabca2365443b50ab378312a38fc3c73d3
+  metadata.gz: 9c4f675494e789a53749cef112475feef669b69f6622b759c88e49c10fbc04f3
+  data.tar.gz: c00d3ba6014aa1f276c40991bb8af637b2eb7c14e6b874756c465732d1c653f6
 SHA512:
-  metadata.gz: 3baf7973f3a75855cebac881fe5ff3bf28da851dc03900151454802cf2b57700dca2c08bf1f532fe43583ac27baa4e9b8fb0f66611bb3209e1a259e38e947a75
-  data.tar.gz: b087fedfedbfa0655eb2febab2705f2e699376ec6ec4974c42bd0d3dc55a068ccf7251b0b201f6e051c27b01334b2f1bea4d27cd6b1f5b7fea872b1401df40ae
+  metadata.gz: 7a5c8d96a33c026c6b7322e04534b4acb6c3af7c120da1bd6c6f04d67c4345e7f961d1fdfa3916e54e1a2a8edfdd2cb8215cc9f72f26e14088c6fe248692089a
+  data.tar.gz: b08af8ba1c5c29d67bfb5e722997902b1664fe07f3aace7552104e0e7cd423d6b7f8aa63094073a10ce42365f0efb0cc9584a2b93108c2be7e9a3a134267760f

data/lib/excon/socket.rb

@@ -52,7 +52,8 @@ module Excon
       @data = data
       @nonblock = data[:nonblock]
       @port ||= @data[:port] || 80
-      @read_buffer = String.new
+      @read_buffer = String.new(encoding: Encoding::BINARY)
+      @read_buffer_scratch = String.new(encoding: Encoding::BINARY)
       @read_offset = 0
       @eof = false
       @backend_eof = false
@@ -239,7 +240,7 @@ module Excon
               # Avoid allocating a new buffer string when the read buffer is empty
               @read_buffer = @socket.read_nonblock(max_length, @read_buffer)
             else
-              @read_buffer << @socket.read_nonblock(max_length - readable_bytes)
+              @read_buffer << @socket.read_nonblock(max_length - readable_bytes, @read_buffer_scratch)
             end
           end
         else
@@ -248,7 +249,7 @@ module Excon
               # Avoid allocating a new buffer string when the read buffer is empty
               @read_buffer = @socket.read_nonblock(@data[:chunk_size], @read_buffer)
             else
-              @read_buffer << @socket.read_nonblock(@data[:chunk_size])
+              @read_buffer << @socket.read_nonblock(@data[:chunk_size], @read_buffer_scratch)
             end
           end
         end
@@ -298,7 +299,7 @@ module Excon
     rescue OpenSSL::SSL::SSLError => e
       select_with_timeout(@socket, :read) && retry if e.message == 'read would block'
 
-      raise(error)
+      raise(e)
     rescue *READ_RETRY_EXCEPTION_CLASSES
       select_with_timeout(@socket, :read) && retry
     rescue EOFError
@@ -322,7 +323,7 @@ module Excon
             raise error
           end
         rescue OpenSSL::SSL::SSLError, *WRITE_RETRY_EXCEPTION_CLASSES => e
-          raise e if error.is_a?(OpenSSL::SSL::SSLError) && e.message != 'write would block'
+          raise e if e.is_a?(OpenSSL::SSL::SSLError) && e.message != 'write would block'
 
           select_with_timeout(@socket, :write) && retry
         end

data/lib/excon/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Excon
-  VERSION = '1.5.0'
+  VERSION = '1.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)