From f88cc8b988976fefdbdf0bf366a1c6f7b0902dfb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adomas=20Ven=C4=8Dkauskas?= Date: Mon, 6 Jun 2022 12:48:29 +0300 Subject: [PATCH] Fix cookieSandbox not overriding user agent if no cookies for domain. Potential fix for #2635 --- chrome/content/zotero/xpcom/cookieSandbox.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/chrome/content/zotero/xpcom/cookieSandbox.js b/chrome/content/zotero/xpcom/cookieSandbox.js index ba7e151f50..6df16c02fc 100755 --- a/chrome/content/zotero/xpcom/cookieSandbox.js +++ b/chrome/content/zotero/xpcom/cookieSandbox.js @@ -383,18 +383,18 @@ Zotero.CookieSandbox.Observer = new function() { if(trackedBy) { var cookiesForURI = trackedBy.getCookiesForURI(channel.URI); } - + + if(trackedBy.userAgent) { + channel.setRequestHeader("User-Agent", trackedBy.userAgent, false); + } + if(!trackedBy || !cookiesForURI) { channel.setRequestHeader("Cookie", "", false); channel.setRequestHeader("Cookie2", "", false); Zotero.debug("CookieSandbox: Cleared cookies to be sent to "+channelURI, 5); return; } - - if(trackedBy.userAgent) { - channel.setRequestHeader("User-Agent", trackedBy.userAgent, false); - } - + // add cookies to be sent to this domain channel.setRequestHeader("Cookie", Zotero.CookieSandbox.generateCookieString(cookiesForURI), false); Zotero.debug("CookieSandbox: Added cookies for request to "+channelURI, 5);