summaryrefslogtreecommitdiffstats
path: root/mailnews/addrbook/src
diff options
context:
space:
mode:
authorMatt A. Tobin <email@mattatobin.com>2019-11-10 17:25:51 -0500
committerMatt A. Tobin <email@mattatobin.com>2019-11-10 17:25:51 -0500
commitbbf10b90975bc11e5ea2ac70196615a041b00f6f (patch)
tree23dc6572ef3c31de044661425de06df75b92d103 /mailnews/addrbook/src
parentb0e23e79e72b7892b826fabea4f9e02c421d2861 (diff)
downloadUXP-bbf10b90975bc11e5ea2ac70196615a041b00f6f.tar
UXP-bbf10b90975bc11e5ea2ac70196615a041b00f6f.tar.gz
UXP-bbf10b90975bc11e5ea2ac70196615a041b00f6f.tar.lz
UXP-bbf10b90975bc11e5ea2ac70196615a041b00f6f.tar.xz
UXP-bbf10b90975bc11e5ea2ac70196615a041b00f6f.zip
Bug 1328847 - Change SEC_NORMAL to SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL where system principal is used.
Tag #1273
Diffstat (limited to 'mailnews/addrbook/src')
-rw-r--r--mailnews/addrbook/src/nsAbContentHandler.cpp2
-rw-r--r--mailnews/addrbook/src/nsAddbookProtocolHandler.cpp17
2 files changed, 13 insertions, 6 deletions
diff --git a/mailnews/addrbook/src/nsAbContentHandler.cpp b/mailnews/addrbook/src/nsAbContentHandler.cpp
index 6e283d82b..3ee00148c 100644
--- a/mailnews/addrbook/src/nsAbContentHandler.cpp
+++ b/mailnews/addrbook/src/nsAbContentHandler.cpp
@@ -125,7 +125,7 @@ nsAbContentHandler::HandleContent(const char *aContentType,
uri,
this,
nullPrincipal,
- nsILoadInfo::SEC_NORMAL,
+ nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
nsIContentPolicy::TYPE_OTHER);
NS_ENSURE_SUCCESS(rv, rv);
diff --git a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
index 2d1fab36e..9507a3cc9 100644
--- a/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
+++ b/mailnews/addrbook/src/nsAddbookProtocolHandler.cpp
@@ -114,8 +114,11 @@ nsAddbookProtocolHandler::GenerateXMLOutputChannel( nsString &aOutput,
if (NS_FAILED(rv))
return rv;
- return NS_NewInputStreamChannel(_retval, aURI, inStr,
- nullPrincipal, nsILoadInfo::SEC_NORMAL,
+ return NS_NewInputStreamChannel(_retval,
+ aURI,
+ inStr,
+ nullPrincipal,
+ nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
nsIContentPolicy::TYPE_OTHER,
NS_LITERAL_CSTRING("text/xml"));
}
@@ -180,9 +183,13 @@ nsAddbookProtocolHandler::NewChannel2(nsIURI *aURI,
if (NS_FAILED(rv))
return rv;
- return NS_NewInputStreamChannel(_retval, aURI, pipeIn,
- nullPrincipal, nsILoadInfo::SEC_NORMAL, nsIContentPolicy::TYPE_OTHER,
- NS_LITERAL_CSTRING("application/x-addvcard"));
+ return NS_NewInputStreamChannel(_retval,
+ aURI,
+ pipeIn,
+ nullPrincipal,
+ nsILoadInfo::SEC_ALLOW_CROSS_ORIGIN_DATA_IS_NULL,
+ nsIContentPolicy::TYPE_OTHER,
+ NS_LITERAL_CSTRING("application/x-addvcard"));
}
nsString output;