Pier Angelo Vendrame pushed to branch tor-browser-140.2.0esr-15.0-1 at The Tor Project / Applications / Tor Browser

Commits:

4 changed files:

Changes:

  • docshell/base/nsAboutRedirector.cpp
    ... ... @@ -223,6 +223,8 @@ static const RedirEntry kRedirMap[] = {
    223 223
              nsIAboutModule::HIDE_FROM_ABOUTABOUT},
    
    224 224
     #endif
    
    225 225
     #ifndef BASE_BROWSER_VERSION
    
    226
    +    // We disable safe browsing and the data update mechanisms. So this page
    
    227
    +    // will be non-functional or at least unreliable.
    
    226 228
         {"url-classifier", "chrome://global/content/aboutUrlClassifier.xhtml",
    
    227 229
          nsIAboutModule::ALLOW_SCRIPT},
    
    228 230
     #endif
    

  • netwerk/url-classifier/UrlClassifierFeatureBase.cpp
    ... ... @@ -80,7 +80,7 @@ void UrlClassifierFeatureBase::InitializePreferences() {
    80 80
     
    
    81 81
       nsCOMPtr<nsIUrlClassifierExceptionListService> exceptionListService =
    
    82 82
           do_GetService("@mozilla.org/url-classifier/exception-list-service;1");
    
    83
    -  if (!exceptionListService) {
    
    83
    +  if (NS_WARN_IF(!exceptionListService)) {
    
    84 84
         return;
    
    85 85
       }
    
    86 86
     
    

  • netwerk/url-classifier/components.conf
    ... ... @@ -13,4 +13,24 @@ Classes = [
    13 13
             'constructor': 'mozilla::net::ChannelClassifierService::GetSingleton',
    
    14 14
             'headers': ['mozilla/net/ChannelClassifierService.h'],
    
    15 15
         },
    
    16
    +    {
    
    17
    +        'cid': '{b9f4fd03-9d87-4bfd-9958-85a821750ddc}',
    
    18
    +        'contract_ids': ['@mozilla.org/url-classifier/exception-list-service;1'],
    
    19
    +        'esModule': 'resource://gre/modules/UrlClassifierExceptionListService.sys.mjs',
    
    20
    +        'constructor': 'UrlClassifierExceptionListService',
    
    21
    +    },
    
    22
    +    {
    
    23
    +        'cid': '{8753A413-3ED6-4A61-A1DC-B31A7E69B796}',
    
    24
    +        'interfaces': ['nsIUrlClassifierExceptionListEntry'],
    
    25
    +        'headers': ['mozilla/net/UrlClassifierExceptionListEntry.h'],
    
    26
    +        'type': 'mozilla::net::UrlClassifierExceptionListEntry',
    
    27
    +        'contract_ids': ['@mozilla.org/url-classifier/exception-list-entry;1'],
    
    28
    +    },
    
    29
    +    {
    
    30
    +        'cid': '{807535BF-018E-4300-B8D3-4A6405FB9F65}',
    
    31
    +        'interfaces': ['nsIUrlClassifierExceptionList'],
    
    32
    +        'headers': ['mozilla/net/UrlClassifierExceptionList.h'],
    
    33
    +        'type': 'mozilla::net::UrlClassifierExceptionList',
    
    34
    +        'contract_ids': ['@mozilla.org/url-classifier/exception-list;1'],
    
    35
    +    },
    
    16 36
     ]

  • toolkit/modules/AppConstants.sys.mjs
    ... ... @@ -210,10 +210,12 @@ export var AppConstants = Object.freeze({
    210 210
       ENABLE_WEBDRIVER: @ENABLE_WEBDRIVER_BOOL@,
    
    211 211
     
    
    212 212
       REMOTE_SETTINGS_SERVER_URL:
    
    213
    -#ifdef MOZ_THUNDERBIRD
    
    213
    +#if defined(BASE_BROWSER_VERSION)
    
    214
    +    "",
    
    215
    +#elif defined(MOZ_THUNDERBIRD)
    
    214 216
         "https://thunderbird-settings.thunderbird.net/v1",
    
    215 217
     #else
    
    216
    -    "",
    
    218
    +    "https://firefox.settings.services.mozilla.com/v1",
    
    217 219
     #endif
    
    218 220
     
    
    219 221
       REMOTE_SETTINGS_VERIFY_SIGNATURE: