Use JSE properties for proxy defaults (JRuby GH ruby#195)

headius · headius · commit a4ecbbb3b5cd · 2012-10-24T15:42:15.000-05:00
diff --git a/lib/net/http.rb b/lib/net/http.rb
@@ -637,8 +637,16 @@ def do_finish
     #       # connecting proxy.foo.org:8080
     #                     :
     #     }
+    #
+    # 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.
     # 
     def HTTP.Proxy(p_addr, p_port = nil, p_user = nil, 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
       return self unless p_addr
       delta = ProxyDelta
       proxyclass = Class.new(self)
