Using http or https accordingly

Fixes #78 Signed-off-by: Giovanni Bassi <giggio@giggio.net>
giggio · Dec 11, 2016 · 5ad68a3 · 5ad68a3
1 parent e79ac33
commit 5ad68a3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/install.js b/install.js
@@ -59,7 +59,7 @@ npmconf.load(function(err, conf) {
   promise = promise.then(function () {
     console.log('Downloading', downloadUrl)
     console.log('Saving to', downloadedFile)
-    return requestBinary(getRequestOptions(conf.get('proxy')), downloadedFile)
+    return requestBinary(getRequestOptions(conf), downloadedFile)
   })
 
   promise.then(function () {
@@ -108,8 +108,9 @@ function findSuitableTempDirectory(npmConf) {
 }
 
 
-function getRequestOptions(proxyUrl) {
-  var options
+function getRequestOptions(conf) {
+  var options = url.parse(downloadUrl);
+  var proxyUrl = options.protocol === 'https:' ? conf.get('https-proxy') : conf.get('proxy');
   if (proxyUrl) {
     options = url.parse(proxyUrl)
     options.path = downloadUrl

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "chromedriver",
-  "version": "2.25.2",
+  "version": "2.25.3",
   "keywords": [
     "chromedriver",
     "selenium"