jruby · Mar 2, 2016 · Mar 2, 2016
Showing with 22 additions and 13 deletions.

+5 −8 lib/ruby/stdlib/net/http.rb

+13 −3 lib/ruby/stdlib/uri/generic.rb

+3 −2 test/mri.index

+1 −0 test/mri/excludes/IMAPTest.rb
diff --git a/lib/ruby/stdlib/net/http.rb b/lib/ruby/stdlib/net/http.rb
@@ -370,6 +370,7 @@ class HTTPHeaderSyntaxError < StandardError; end
   #   HTTPPreconditionRequired::            428
   #   HTTPTooManyRequests::                 429
   #   HTTPRequestHeaderFieldsTooLarge::     431
+  #   HTTPUnavailableForLegalReasons::      451
   # HTTPServerError::                    5xx
   #   HTTPInternalServerError::             500
   #   HTTPNotImplemented::                  501
@@ -609,9 +610,9 @@ class << HTTP
     #
     # In JRuby, this will default to the JSE proxy settings provided in the
     # 'http.proxyHost' and 'http.proxyPort' Java system properties, if they
-    # are set and no alternative proxy has been provided.
+    # are set, falling back on environment variables otherwise.
     #
-    def HTTP.new(address, port = nil, p_addr = ENV_JAVA['http.proxyHost'], p_port = ENV_JAVA['http.proxyPort'], p_user = nil, p_pass = nil)
+    def HTTP.new(address, port = nil, p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil)
       http = super address, port
 
       if proxy_class? then # from Net::HTTP::Proxy()
@@ -999,13 +1000,9 @@ def do_finish
     #
     # In JRuby, this will default to the JSE proxy settings provided in the
     # 'http.proxyHost' and 'http.proxyPort' Java system properties, if they
-    # are set and no alternative proxy has been provided.
+    # are set, falling back on environment variables otherwise.
     #
-    def HTTP.Proxy(p_addr = :ENV, p_port = ENV_JAVA['http.proxyHost'], p_user = ENV_JAVA['http.proxyPort'], p_pass = nil)
-      j_addr = ENV_JAVA['http.proxyHost']
-      j_port = ENV_JAVA['http.proxyPort']
-      p_addr = p_addr || j_addr
-      p_port = p_port || j_port
+    def HTTP.Proxy(p_addr = :ENV, p_port = nil, p_user = nil, p_pass = nil)
       return self unless p_addr
 
       Class.new(self) {

diff --git a/lib/ruby/stdlib/uri/generic.rb b/lib/ruby/stdlib/uri/generic.rb
@@ -1522,9 +1522,19 @@ def find_proxy
           proxy_uri = ENV["CGI_#{name.upcase}"]
         end
       elsif name == 'http_proxy'
-        unless proxy_uri = ENV[name]
-          if proxy_uri = ENV[name.upcase]
-            warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.'
+        if p_addr = ENV_JAVA['http.proxyHost']
+          p_port = ENV_JAVA['http.proxyPort']
+          if p_user = ENV_JAVA['http.proxyUser']
+            p_pass = ENV_JAVA['http.proxyPass']
+            proxy_uri = "http://#{p_user}:#{p_pass}@#{p_addr}:#{p_port}"
+          else
+            proxy_uri = "http://#{p_addr}:#{p_port}"
+          end
+        else
+          unless proxy_uri = ENV[name]
+            if proxy_uri = ENV[name.upcase]
+              warn 'The environment variable HTTP_PROXY is discouraged.  Use http_proxy.'
+            end
           end
         end
       else

diff --git a/test/mri.index b/test/mri.index
@@ -209,7 +209,9 @@ matrix/test_vector.rb
 
 monitor/test_monitor.rb
 
+net/ftp/test_buffered_socket.rb
 net/ftp/test_ftp.rb
+net/ftp/test_mlsx_entry.rb
 net/http/test_buffered_io.rb
 net/http/test_http.rb
 net/http/test_http_request.rb
@@ -218,8 +220,7 @@ net/http/test_httpresponse.rb
 net/http/test_httpresponses.rb
 net/http/test_https.rb
 net/http/test_https_proxy.rb
-# hangs and mostly fails.rb
-#net/imap/test_imap.rb
+net/imap/test_imap.rb
 net/imap/test_imap_response_parser.rb
 net/pop/test_pop.rb
 net/protocol/test_protocol.rb

diff --git a/test/mri/excludes/IMAPTest.rb b/test/mri/excludes/IMAPTest.rb
@@ -0,0 +1 @@
+exclude :test_imaps_post_connection_check, "Error: closed SSL engine"
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		exclude :test_imaps_post_connection_check, "Error: closed SSL engine"