commit a98e6ab4fb37c6d4c7964e6662dba4f782d41f2e
parent f7a2ef66983ceaf2e58819fefdc4913e87709486
Author: Dan Stillman <dstillman@zotero.org>
Date: Mon, 9 Feb 2015 04:57:47 -0500
Merge pull request #627 from aurimasv/connector-double-proxy
Don't proxify proxied hosts
Diffstat:
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/chrome/content/zotero/xpcom/connector/translator.js b/chrome/content/zotero/xpcom/connector/translator.js
@@ -203,7 +203,7 @@ Zotero.Translators = new function() {
} else {
// in Firefox, push the converterFunction
converterFunctions.push(new function() {
- var re = new RegExp('^https?://(?:[^/]\\.)?'+Zotero.Utilities.quotemeta(properHosts[j-1]), "gi");
+ var re = new RegExp('^https?://(?:[^/]\\.)?'+Zotero.Utilities.quotemeta(properHosts[j-1])+'/', "gi");
var proxyHost = proxyHosts[j-1].replace(/\$/g, "$$$$");
return function(uri) { return uri.replace(re, "$&."+proxyHost) };
});