Bug 902375 - Actually use the optional parameter added explicitly for this purpose. r=bsmedberg, a=bajaj
authorJohn Schoenick <jschoenick@mozilla.com>
Wed, 07 Aug 2013 13:23:42 -0700
changeset 148423 19d4d4a860515ca0b1b62058864dcf73dd1cab0a
parent 148422 1c39ca9daa6c1fe0b6fb819772a5258a8aa4b4aa
child 148424 2434984154563ee84b9a57c3973faa9d29072af8
push id2797
push userryanvm@gmail.com
push dateFri, 23 Aug 2013 16:48:13 +0000
treeherdermozilla-beta@243498415456 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, bajaj
bugs902375
milestone24.0
Bug 902375 - Actually use the optional parameter added explicitly for this purpose. r=bsmedberg, a=bajaj
content/base/src/nsObjectLoadingContent.cpp
--- a/content/base/src/nsObjectLoadingContent.cpp
+++ b/content/base/src/nsObjectLoadingContent.cpp
@@ -1256,17 +1256,17 @@ nsObjectLoadingContent::CheckJavaCodebas
   if (NS_FAILED(rv)) {
     NS_NOTREACHED("Failed to URI from node principal?");
     return false;
   }
   // We currently allow java's codebase to be non-same-origin, with
   // the exception of URIs that represent local files
   if (NS_URIIsLocalFile(mBaseURI) &&
       nsScriptSecurityManager::GetStrictFileOriginPolicy() &&
-      !NS_RelaxStrictFileOriginPolicy(mBaseURI, principalBaseURI)) {
+      !NS_RelaxStrictFileOriginPolicy(mBaseURI, principalBaseURI, true)) {
     LOG(("OBJLC [%p]: Java failed RelaxStrictFileOriginPolicy for file URI",
          this));
     return false;
   }
 
   return true;
 }