Merge pull request #88 from jakauppila/fix_no_proxy

Add explicit nil proxy arguments - Corrects no_proxy support

Author: drbrain

lib/net/http/persistent.rb

@@ -635,8 +635,11 @@ def connection_for uri
 
     net_http_args = [uri.host, uri.port]
 
-    net_http_args.concat @proxy_args if
-      @proxy_uri and not proxy_bypass? uri.host, uri.port
+    if @proxy_uri and not proxy_bypass? uri.host, uri.port then
+      net_http_args.concat @proxy_args
+    else
+      net_http_args.concat [nil, nil, nil, nil]
+    end
 
     connection = @pool.checkout net_http_args
 

test/test_net_http_persistent.rb

@@ -120,7 +120,7 @@ def proxy_port
   def basic_connection
     raise "#{@uri} is not HTTP" unless @uri.scheme.downcase == 'http'
 
-    net_http_args = [@uri.host, @uri.port]
+    net_http_args = [@uri.host, @uri.port, nil, nil, nil, nil]
 
     connection = Net::HTTP::Persistent::Connection.allocate
     connection.ssl_generation = @http.ssl_generation
@@ -152,7 +152,7 @@ def r.read_body() :read_body end
   def ssl_connection
     raise "#{@uri} is not HTTPS" unless @uri.scheme.downcase == 'https'
 
-    net_http_args = [@uri.host, @uri.port]
+    net_http_args = [@uri.host, @uri.port, nil, nil, nil, nil]
 
     connection = Net::HTTP::Persistent::Connection.allocate
     connection.ssl_generation = @http.ssl_generation
@@ -279,7 +279,7 @@ def test_connection_for
       c
     end
 
-    stored = @http.pool.checkout ['example.com', 80]
+    stored = @http.pool.checkout ['example.com', 80, nil, nil, nil, nil]
 
     assert_same used, stored
   end