Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-14 04:03:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 285204b60e94 and f401b820cd6a (bug 967693) to turn HTTP cache v2 off to investigate the effect on the influx of failed tests

Browse Source 
CLOSED TREE
This commit is contained in:
Phil Ringnalda 2014-02-05 22:58:37 -08:00
parent 6dabf48731
commit 33ffca7f1b
3 changed files with 1 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
browser/app/profile/firefox.js
View File

@ -1361,7 +1361,3 @@ pref("identity.fxaccounts.settings.uri", "https://accounts.firefox.com/settings"
// The URL of the Firefox Accounts auth server backend // The URL of the Firefox Accounts auth server backend
pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1"); pref("identity.fxaccounts.auth.uri", "https://api.accounts.firefox.com/v1");
// Temporarily turn the new http cache v2 on for Desktop Firefox only
pref("browser.cache.use_new_backend_temp", true);

3
browser/devtools/debugger/test/browser_dbg_stack-02.js
View File

@ -48,11 +48,8 @@ function performTest() {
is(gFrames.selectedIndex, 1, is(gFrames.selectedIndex, 1,
"Newest frame should be selected by default."); "Newest frame should be selected by default.");
/*
DISABLED FOR CACHE2 FAILURES, bug 948566
is(gClassicFrames.selectedIndex, 0, is(gClassicFrames.selectedIndex, 0,
"Newest frame should be selected by default in the mirrored view."); "Newest frame should be selected by default in the mirrored view.");
*/
isnot(gFrames.selectedIndex, 0, isnot(gFrames.selectedIndex, 0,
"Oldest frame should not be selected."); "Oldest frame should not be selected.");

12
netwerk/cache2/CacheObserver.cpp
View File

@ -25,9 +25,6 @@ uint32_t CacheObserver::sMemoryLimit = kDefaultMemoryLimit;
static uint32_t const kDefaultUseNewCache = 0; // Don't use the new cache by default static uint32_t const kDefaultUseNewCache = 0; // Don't use the new cache by default
uint32_t CacheObserver::sUseNewCache = kDefaultUseNewCache; uint32_t CacheObserver::sUseNewCache = kDefaultUseNewCache;
static bool sUseNewCacheTemp = false; // Temp trigger to not lose early adopters
static int32_t const kAutoDeleteCacheVersion = -1; // Auto-delete off by default static int32_t const kAutoDeleteCacheVersion = -1; // Auto-delete off by default
static int32_t sAutoDeleteCacheVersion = kAutoDeleteCacheVersion; static int32_t sAutoDeleteCacheVersion = kAutoDeleteCacheVersion;
@ -105,8 +102,6 @@ CacheObserver::AttachToPreferences()
mozilla::Preferences::AddUintVarCache( mozilla::Preferences::AddUintVarCache(
&sUseNewCache, "browser.cache.use_new_backend", kDefaultUseNewCache); &sUseNewCache, "browser.cache.use_new_backend", kDefaultUseNewCache);
mozilla::Preferences::AddBoolVarCache(
&sUseNewCacheTemp, "browser.cache.use_new_backend_temp", false);
mozilla::Preferences::AddBoolVarCache( mozilla::Preferences::AddBoolVarCache(
&sUseDiskCache, "browser.cache.disk.enable", kDefaultUseDiskCache); &sUseDiskCache, "browser.cache.disk.enable", kDefaultUseDiskCache);
@ -182,12 +177,7 @@ void CacheObserver::SchduleAutoDelete()
// static // static
bool const CacheObserver::UseNewCache() bool const CacheObserver::UseNewCache()
{ {
uint32_t useNewCache = sUseNewCache; switch (sUseNewCache) {
if (sUseNewCacheTemp)
useNewCache = 1;
switch (useNewCache) {
case 0: // use the old cache backend case 0: // use the old cache backend
return false; return false;