wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 667490 - EventSource should use the same nsIContentPolicy type as XHR, r=dveditz

Browse Source
This commit is contained in:
Olli Pettay 2011-10-31 14:48:50 +02:00
parent adee95299d
commit d57ca4ef6c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
content/base/public/nsIContentPolicy.idl
View File

@ -112,9 +112,10 @@ interface nsIContentPolicy : nsISupports
const unsigned long TYPE_PING = 10; const unsigned long TYPE_PING = 10;
/** /**
* Indicates an XMLHttpRequest. Also used for document.load. * Indicates an XMLHttpRequest. Also used for document.load and for EventSource.
*/ */
const unsigned long TYPE_XMLHTTPREQUEST = 11; const unsigned long TYPE_XMLHTTPREQUEST = 11;
const unsigned long TYPE_DATAREQUEST = 11; // alias
/** /**
* Indicates a request by a plugin. * Indicates a request by a plugin.

4
content/base/src/nsEventSource.cpp
View File

@ -872,7 +872,7 @@ nsEventSource::InitChannelAndRequestEventSource()
if (csp) { if (csp) {
channelPolicy = do_CreateInstance("@mozilla.org/nschannelpolicy;1"); channelPolicy = do_CreateInstance("@mozilla.org/nschannelpolicy;1");
channelPolicy->SetContentSecurityPolicy(csp); channelPolicy->SetContentSecurityPolicy(csp);
channelPolicy->SetLoadType(nsIContentPolicy::TYPE_SCRIPT); channelPolicy->SetLoadType(nsIContentPolicy::TYPE_DATAREQUEST);
} }
nsCOMPtr<nsIChannel> channel; nsCOMPtr<nsIChannel> channel;
@ -1203,7 +1203,7 @@ nsEventSource::CheckCanRequestSrc(nsIURI* aSrc)
rv = CheckInnerWindowCorrectness(); rv = CheckInnerWindowCorrectness();
NS_ENSURE_SUCCESS(rv, false); NS_ENSURE_SUCCESS(rv, false);
PRInt16 shouldLoad = nsIContentPolicy::ACCEPT; PRInt16 shouldLoad = nsIContentPolicy::ACCEPT;
rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_SCRIPT, rv = NS_CheckContentLoadPolicy(nsIContentPolicy::TYPE_DATAREQUEST,
srcToTest, srcToTest,
mPrincipal, mPrincipal,
doc, doc,