diff --git a/mozilla/caps/idl/nsIScriptSecurityManager.idl b/mozilla/caps/idl/nsIScriptSecurityManager.idl
index ff2d1b8a071..633e0ef3409 100644
--- a/mozilla/caps/idl/nsIScriptSecurityManager.idl
+++ b/mozilla/caps/idl/nsIScriptSecurityManager.idl
@@ -86,7 +86,7 @@ interface nsIScriptSecurityManager : nsIXPCSecurityManager
     const unsigned long ALLOW_CHROME = 1 << 1;
 
     // Don't allow javascript: (and data:) URLs to load
-    const unsigned long DISALLOW_JAVASCRIPT = 1 << 2;
+    const unsigned long DISALLOW_SCRIPT_OR_DATA = 1 << 2;
 
     /**
      * Check that content from "from" can load "uri".
diff --git a/mozilla/caps/src/nsScriptSecurityManager.cpp b/mozilla/caps/src/nsScriptSecurityManager.cpp
index 34b9722ea5a..5732e50c5b2 100644
--- a/mozilla/caps/src/nsScriptSecurityManager.cpp
+++ b/mozilla/caps/src/nsScriptSecurityManager.cpp
@@ -1217,7 +1217,7 @@ nsScriptSecurityManager::CheckLoadURI(nsIURI *aSourceURI, nsIURI *aTargetURI,
     }
 
     //-- Some callers do not allow loading javascript: or data: URLs
-    if ((aFlags & nsIScriptSecurityManager::DISALLOW_JAVASCRIPT) &&
+    if ((aFlags & nsIScriptSecurityManager::DISALLOW_SCRIPT_OR_DATA) &&
         (targetScheme.Equals("javascript") || targetScheme.Equals("data")))
     {
        return NS_ERROR_DOM_BAD_URI;
diff --git a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
index 72f13e42069..c639e6ae4b6 100644
--- a/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
+++ b/mozilla/netwerk/protocol/http/src/nsHttpChannel.cpp
@@ -1778,7 +1778,7 @@ nsHttpChannel::ProcessRedirection(PRUint32 redirectType)
     if (securityManager) {
         rv = securityManager->CheckLoadURI(mURI, newURI,
                                            nsIScriptSecurityManager::DISALLOW_FROM_MAIL |
-                                           nsIScriptSecurityManager::DISALLOW_JAVASCRIPT);
+                                           nsIScriptSecurityManager::DISALLOW_SCRIPT_OR_DATA);
         if (NS_FAILED(rv)) return rv;
     }