net-http-persistent 2.9.1 → 2.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55d2e4859498dd8d729452db6118d77d13535bd1
-  data.tar.gz: 7d1a5487a20e2d8d44be10241010e7022af2262f
+  metadata.gz: d97c47fe4e98a924fe059c0214f345bbc9e1ee1d
+  data.tar.gz: ef1438b224c5d17d5f1d94f11fecbd5527b57909
 SHA512:
-  metadata.gz: 736f79380094d6b6a84b923c6e8251ee75e95b66185bb072ba7f19450263c0e96b95e0ce92622050cddb3a5dc8e9e2fc3c04ab82f1787e3524b22902f340d9b9
-  data.tar.gz: 0b0c2b885b275bb98e64e22d4c96869496ff3602e17c9be2b846015293354646d4685204d7b32ed56d79a55dd9633fd84bb8b09fc49fb83448cae72a849dd9e4
+  metadata.gz: a9c9f30e712239d8e75af6ac42ec184d89ae5fff1c090ac27279e655dcafcec083ad4eeb1fc50c077804dc6a0779b20b09f622fba45a31bc45421f75fdb62f95
+  data.tar.gz: b51b2a2bf007809033ded4b0d404297b6fdc329e65d36405aca53c352cc5840490f88d3d5a6f232b26ec6159835967fa8687485ab2075c9dddec671cb49cae81

data/History.txt

@@ -1,3 +1,9 @@
+=== 2.9.2 / 2014-02-05
+
+* Bug fixes
+  * Special characters in proxy passwords are now handled correctly.  Issue
+    #48 by Mislav Marohnić.  Pull request #54 by Juha Kajava
+
 === 2.9.1 / 2014-01-22
 
 * Bug fixes

data/lib/net/http/persistent.rb

@@ -203,7 +203,7 @@ class Net::HTTP::Persistent
   ##
   # The version of Net::HTTP::Persistent you are using
 
-  VERSION = '2.9.1'
+  VERSION = '2.9.2'
 
   ##
   # Exceptions rescued for automatic retry on ruby 2.0.0.  This overlaps with
@@ -667,6 +667,14 @@ class Net::HTTP::Persistent
     CGI.escape str if str
   end
 
+  ##
+  # URI::unescape wrapper
+
+  def unescape str
+    CGI.unescape str if str
+  end
+
+
   ##
   # Returns true if the connection should be reset due to an idle timeout, or
   # maximum request count, false otherwise.
@@ -855,6 +863,9 @@ class Net::HTTP::Persistent
 
     @no_proxy.clear
 
+    @proxy_uri.user = unescape @proxy_uri.user
+    @proxy_uri.password = unescape @proxy_uri.password
+
     if @proxy_uri then
       @proxy_args = [
         @proxy_uri.host,

data/test/test_net_http_persistent.rb

@@ -505,6 +505,17 @@ class TestNetHttpPersistent < Minitest::Test
     assert_same c, conns[1]['example.com:80:proxy.example:80:johndoe:muffins']
   end
 
+  def test_connection_for_proxy_unescaped
+    uri = URI.parse 'http://proxy.example'
+    uri.user     = 'john%24doe'
+    uri.password = 'muf%24fins'
+
+    http = Net::HTTP::Persistent.new nil, uri
+
+    assert_equal 'john$doe', http.proxy_uri.user
+    assert_equal 'muf$fins', http.proxy_uri.password
+  end
+
   def test_connection_for_proxy_host_down
     Net::HTTP.use_connect :host_down_connect
     Net::HTTP::Persistent::SSLReuse.use_connect :host_down_connect
@@ -646,6 +657,12 @@ class TestNetHttpPersistent < Minitest::Test
     assert_equal '+%3F', @http.escape(' ?')
   end
 
+  def test_unescape
+    assert_nil @http.unescape nil
+
+    assert_equal ' ?', @http.unescape('+%3F')
+  end
+
   def test_expired_eh
     c = basic_connection
     reqs[c.object_id] = 0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: net-http-persistent
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.9.2
 platform: ruby
 authors:
 - Eric Hodel
@@ -30,7 +30,7 @@ cert_chain:
   KDyY1VIazVgoC8XvR4h/95/iScPiuglzA+DBG1hip1xScAtw05BrXyUNrc9CEMYU
   wgF94UVoHRp6ywo8I7NP3HcwFQDFNEZPNGXsng==
   -----END CERTIFICATE-----
-date: 2014-01-22 00:00:00.000000000 Z
+date: 2014-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest