From 5742c507e0587a7001d23155a57e89c1cb45e4f6 Mon Sep 17 00:00:00 2001 From: Cameron Kaiser Date: Fri, 2 Nov 2018 20:55:56 -0700 Subject: [PATCH] #525: improve message --- docshell/base/nsDocShell.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/docshell/base/nsDocShell.cpp b/docshell/base/nsDocShell.cpp index d01e9053f..456d014c1 100644 --- a/docshell/base/nsDocShell.cpp +++ b/docshell/base/nsDocShell.cpp @@ -10596,15 +10596,17 @@ nsDocShell::DoURILoad(nsIURI* aURI, // the principal, and thus does not have flags on the protocol that // ask for it. If the load is for a data: URI, inherit the principal if // the system principal initiated the load to maintain compatibility - // with addons, but warn the user as a penalty (TenFourFox issue 525). + // with addons (TenFourFox issue 525). This still maintains unique URIs + // for web content, so it's still an improvement over previously. bool isData = false; rv = aURI->SchemeIs("data", &isData); if (NS_SUCCEEDED(rv) && isData) { if (nsContentUtils::IsSystemPrincipal(triggeringPrincipal)) { +#if DEBUG fprintf(stderr, "Warning: TenFourFox enabling inherited principal for data: URI from system.\n" -"Warning: Make sure you are using a minimum set of up-to-date addons.\n" ); +#endif inherit = true; } }