Merge pull request #1295 from oliamb/fix-issue-1294

fix(proxy): no-proxy false positive
request · Nov 28, 2014 · 8f2ded1 · 8f2ded1
2 parents 9f402f8 + 9fa20d2
commit 8f2ded1
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/request.js b/request.js
@@ -199,7 +199,8 @@ function getProxyFromURI(uri) {
         }
       } else {
         noProxyItem = noProxyItem.replace(/^\.*/, '.')
-        if (hostname.indexOf(noProxyItem) === hostname.length - noProxyItem.length) {
+        var isMatchedAt = hostname.indexOf(noProxyItem)
+        if (isMatchedAt > -1 && isMatchedAt === hostname.length - noProxyItem.length) {
           return null
         }
       }

diff --git a/tests/test-proxy.js b/tests/test-proxy.js
@@ -131,6 +131,13 @@ if (process.env.TEST_PROXY_HARNESS) {
     env : { http_proxy : s.url }
   }, true)
 
+  runTest('http_proxy with length of one more than the URL', {
+    env: {
+      HTTP_PROXY : s.url,
+      NO_PROXY: 'elgoog1.com' // one more char than google.com
+    }
+  }, true)
+
   runTest('NO_PROXY hostnames are case insensitive', {
     env : {
       HTTP_PROXY : s.url,