A fix for Cappuccino issue 759.

amendment.
280north · Mar 18, 2011 · 7e20109 · 7e20109
1 parent 153c465
commit 7e20109
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/engines/rhino/bin/narwhal-rhino b/engines/rhino/bin/narwhal-rhino
@@ -21,7 +21,15 @@ fi
 
 CLASSPATH=$NARWHAL_ENGINE_HOME/jars/jna.jar
 BOOTCLASSPATH=$NARWHAL_ENGINE_HOME/jars/js.jar
-JAVA_OPTS=""
+
+# Parse the http_proxy environment variable.
+# http://cache.myproxy.com:42/ => cache.myproxy.com
+http_proxy_host=`echo $http_proxy | sed 's/http:\/\/\(.*\):.*/\1/'`
+
+# http://cache.myproxy.com:42/ =>  42
+http_proxy_port=`echo $http_proxy | sed 's/http:\/\/.*:\(.*\)\//\1/'`
+
+JAVA_OPTS="-Dhttp.proxyHost=$http_proxy_host -Dhttp.proxyPort=$http_proxy_port"
 
 if [ -n "$NARWHAL_CLASSPATH" ]; then
     CLASSPATH=$NARWHAL_CLASSPATH:$CLASSPATH

diff --git a/engines/rhino/lib/http-client-engine.js b/engines/rhino/lib/http-client-engine.js
@@ -9,8 +9,19 @@ var IO = require("io").IO;
 exports.open = function(url, mode, options) {
     var connection, output, input;
 
+    function findProxy() {
+        selector = java.net.ProxySelector.getDefault();
+        proxies = selector.select(java.net.URI(url));
+
+        //This list is never empty -- at the very least, it contains
+        //java.net.Proxy.NO_PROXY.  See java.net.ProxySelector.select()
+        //and java.net.Proxy.
+        return proxies.get(0);
+    }
+
     function initConnection() {
-        connection = new java.net.URL(url).openConnection();
+        proxy = findProxy();
+        connection = new java.net.URL(url).openConnection(proxy);
         connection.setDoInput(true);
         connection.setDoOutput(false);
         connection.setRequestMethod(options.method);