excon 0.36.0 → 0.37.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDU5NjFhMTVjODUyOTk3NWI0NzRmNjI4YTlkY2U4ZGU4M2JlZDNlNQ==
+    ZTA1OTcwN2U0ZDZkNWFiYWI0ZGY3NzkzZjgwNDg0MDJlOTI0OGM2Ng==
   data.tar.gz: !binary |-
-    M2ExNjg1NjdjZDFjMGMxNmMwNzQwM2NmOWEwMTBmN2U4ZWUxY2NjZg==
+    MDhkY2IzMmQyNmU1NTQ1MzA4NTRlZDljMDNlYzkxMzI2YjRhMjNjOQ==
 SHA512:
   metadata.gz: !binary |-
-    YWViOTA0NjQ1N2E5ZWY0ZTlmNGJiZTE0ZmUzMTg2YmFhOTQ0NDBhYTRlMWVk
-    MzM2OWI2YzE3MjQzMzA2ZTY3ZWUxYWUzMzI2ZGJlYWRkNjMyODYzODhhYTBj
-    M2Q1NDZjYzA2N2UwYmY3YmM4YzU3NzI0M2YxYjY4YzZiNzU4ZTc=
+    NTMxZjAyMDViNmI2N2MzY2VhYjQyMDg1OTU1ZmZmN2U2NTk5Y2NjNDQ5ZDMw
+    MWNlMWRlNzYyNWM3ZGE5MjkyZDhjYjk2NTI5YjU1NTIxMWM3MTk0Yjc4M2M0
+    MjQxMmU1NzM3ZGQxZGM1NGFlMjYzMWIxZjI5NzRmNThlODJmNTU=
   data.tar.gz: !binary |-
-    MTM2ZTExOTYxMzFlZjlkY2E3M2Q3YjVjMDRkOGQzOTc3NTUxMGVlYzMwMzAy
-    NWU0OTFjZWM4NDRmZjEzYTIzY2M1ZjJhYmRkYmY3MzhiNTllMDlkYWJiYWRk
-    NjM1M2YwNmU2OTU5MDVhMjQxMTQwMTFkYTY1ZDllN2VkMTY1ZTE=
+    ZDQxMWEyZjljYzk1ZTljOTdiMTc4Njk5NzEzNGQxYWFhODU1MDgzZWI3Nzkw
+    OWQzOTgwODZkMzliYmVhOGY5YTdiNGZhYTExOTI5MmRmOTA4MmIyNDJjOTRl
+    ZmRlNmYzNDhiZmJkNzk5ZjJiM2JlODQ2ZWFiM2RhZjc3MDhiOWY=

data/CONTRIBUTING.md

@@ -5,19 +5,19 @@ New contributors are always welcome, when it doubt please ask questions. We stri
 ### Coding
 
 * Pick a task:
-  * Offer feedback on open [pull requests](https://github.com/geemus/excon/pulls).
-  * Review open [issues](https://github.com/geemus/excon/issues) for things to help on.
-  * [Create an issue](https://github.com/geemus/excon/issues/new) to start a discussion on additions or features.
+  * Offer feedback on open [pull requests](https://github.com/excon/excon/pulls).
+  * Review open [issues](https://github.com/excon/excon/issues) for things to help on.
+  * [Create an issue](https://github.com/excon/excon/issues/new) to start a discussion on additions or features.
 * Fork the project, add your changes and tests to cover them in a topic branch.
-* Commit your changes and rebase against `geemus/excon` to ensure everything is up to date.
-* [Submit a pull request](https://github.com/geemus/excon/compare/).
+* Commit your changes and rebase against `excon/excon` to ensure everything is up to date.
+* [Submit a pull request](https://github.com/excon/excon/compare/).
 
 ### Non-Coding
 
 * Work for {twitter}[http://twitter.com]? I'd love to reclaim the unused {@excon}[http://twitter.com/excon] account!
-* Offer feedback on open [issues](https://github.com/geemus/excon/issues).
-* Write and help edit [documentation](https://github.com/geemus/excon.github.com).
-* Translate [documentation](https://github.com/geemus/excon.github.com) in to other languages.
+* Offer feedback on open [issues](https://github.com/excon/excon/issues).
+* Write and help edit [documentation](https://github.com/excon/excon.github.com).
+* Translate [documentation](https://github.com/excon/excon.github.com) in to other languages.
 * Organize or volunteer at events.
 * [Donate](https://www.gittip.com/geemus/)!
 * Discuss other ideas for contribution with [geemus](mailto:geemus+excon@gmail.com).

data/CONTRIBUTORS.md

@@ -75,6 +75,7 @@
 * Tom Maher <tmaher@heroku.com>
 * Tom Maher <tmaher@tursom.org>
 * Trym Skaar <trym@tryms.no>
+* Tuomas Silen <tuomas.silen@nodeta.fi>
 * Viven <vivien.schilis@gmail.com>
 * Wesley Beary <geemus+github@gmail.com>
 * Wesley Beary <geemus@engineyard.com>

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    excon (0.36.0)
+    excon (0.37.0)
 
 GEM
   remote: http://rubygems.org/

data/LICENSE.md

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2009-2014 [CONTRIBUTORS.md](https://github.com/geemus/excon/blob/master/CONTRIBUTORS.md)
+Copyright (c) 2009-2014 [CONTRIBUTORS.md](https://github.com/excon/excon/blob/master/CONTRIBUTORS.md)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of
 this software and associated documentation files (the "Software"), to deal in

data/changelog.txt

@@ -1,3 +1,9 @@
+0.37.0 06/09/2014
+=================
+
+fix chunked reading to avoid chop! on non-chunk endings
+fixes for proxy usage
+
 0.36.0 06/04/2014
 =================
 

data/excon.gemspec

@@ -13,8 +13,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'excon'
-  s.version           = '0.36.0'
-  s.date              = '2014-06-04'
+  s.version           = '0.37.0'
+  s.date              = '2014-06-09'
   s.rubyforge_project = 'excon'
 
   ## Make sure your summary is short. The description may be as long

data/lib/excon/connection.rb

@@ -71,10 +71,10 @@ module Excon
         end
       end
 
-      if @data[:proxy]
+      if @data[:proxy] && @data[:scheme] == 'http'
         @data[:headers]['Proxy-Connection'] ||= 'Keep-Alive'
         # https credentials happen in handshake
-        if @data[:scheme] == 'http' && (@data[:proxy][:user] || @data[:proxy][:password])
+        if @data[:proxy][:user] || @data[:proxy][:password]
           user, pass = Utils.unescape_form(@data[:proxy][:user].to_s), Utils.unescape_form(@data[:proxy][:password].to_s)
           auth = ['' << user.to_s << ':' << pass.to_s].pack('m').delete(Excon::CR_NL)
           @data[:headers]['Proxy-Authorization'] = 'Basic ' << auth
@@ -126,7 +126,7 @@ module Excon
           socket.data = datum
           # start with "METHOD /path"
           request = datum[:method].to_s.upcase << ' '
-          if datum[:proxy]
+          if datum[:proxy] && datum[:scheme] != HTTPS
             request << datum[:scheme] << '://' << datum[:host] << port_string(datum)
           end
           request << datum[:path]

data/lib/excon/constants.rb

@@ -1,6 +1,6 @@
 module Excon
 
-  VERSION = '0.36.0'
+  VERSION = '0.37.0'
 
   CR_NL = "\r\n"
 

data/lib/excon/response.rb

@@ -77,22 +77,22 @@ module Excon
 
         if transfer_encoding_chunked
           if response_block
-            while (chunk_size = socket.readline.chop!.to_i(16)) > 0
-              chunk_size += 2 # 2 == "\r\n".length
+            while (chunk_size = socket.readline.chomp!.to_i(16)) > 0
               while chunk_size > 0
                 chunk = socket.read(chunk_size)
-                chunk_size -= chunk.length
-                response_block.call(chunk.chop!, nil, nil)
+                chunk_size -= chunk.bytesize
+                response_block.call(chunk, nil, nil)
               end
+              socket.read(2) # 2 == "\r\n".length
             end
           else
-            while (chunk_size = socket.readline.chop!.to_i(16)) > 0
-              chunk_size += 2 # 2 == "\r\n".length
+            while (chunk_size = socket.readline.chomp!.to_i(16)) > 0
               while chunk_size > 0
                 chunk = socket.read(chunk_size)
-                chunk_size -= chunk.length
-                datum[:response][:body] << chunk.chop!
+                chunk_size -= chunk.bytesize
+                datum[:response][:body] << chunk
               end
+              socket.read(2) # 2 == "\r\n".length
             end
           end
           parse_headers(socket, datum) # merge trailers into headers
@@ -100,14 +100,14 @@ module Excon
           if response_block
             while remaining > 0
               chunk = socket.read([datum[:chunk_size], remaining].min)
-              response_block.call(chunk, [remaining - chunk.length, 0].max, content_length)
-              remaining -= chunk.length
+              response_block.call(chunk, [remaining - chunk.bytesize, 0].max, content_length)
+              remaining -= chunk.bytesize
             end
           else
             while remaining > 0
               chunk = socket.read([datum[:chunk_size], remaining].min)
               datum[:response][:body] << chunk
-              remaining -= chunk.length
+              remaining -= chunk.bytesize
             end
           end
         else
@@ -127,7 +127,7 @@ module Excon
 
     def self.parse_headers(socket, datum)
       last_key = nil
-      until (data = socket.readline.chop!).empty?
+      until (data = socket.readline.chomp!).empty?
         if !data.lstrip!.nil?
           raise Excon::Errors::ResponseParseError, 'malformed header' unless last_key
           # append to last_key's last value

data/lib/excon/ssl_socket.rb

@@ -69,7 +69,7 @@ module Excon
       end
 
       if @data[:proxy]
-        request = 'CONNECT ' << @data[:host] << port_string(@data) << Excon::HTTP_1_1
+        request = 'CONNECT ' << @data[:host] << port_string(@data.merge(:omit_default_port => false)) << Excon::HTTP_1_1
         request << 'Host: ' << @data[:host] << port_string(@data) << Excon::CR_NL
 
         if @data[:proxy][:password] || @data[:proxy][:user]
@@ -91,12 +91,12 @@ module Excon
       # convert Socket to OpenSSL::SSL::SSLSocket
       @socket = OpenSSL::SSL::SSLSocket.new(@socket, ssl_context)
       @socket.sync_close = true
-      
+
       # Server Name Indication (SNI) RFC 3546
       if @socket.respond_to?(:hostname=)
         @socket.hostname = @data[:host]
       end
-      
+
       begin
         Timeout.timeout(@data[:connect_timeout]) do
           if @nonblock

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: excon
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - dpiddy (Dan Peterson)
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport