Backed out changeset e73523d185a7 (bug 567365) for m-oth failures in test_bug112564.xul

2016-01-26 16:11:13 +01:00
parent 3871a4e9eb
commit 04345c4a5b
2 changed files with 11 additions and 5 deletions
--- a/docshell/base/nsDocShell.cpp
+++ b/docshell/base/nsDocShell.cpp
@@ -12541,9 +12541,13 @@ nsDocShell::ShouldDiscardLayoutState(nsIHttpChannel* aChannel)
  }

  // figure out if SH should be saving layout state
-  bool noStore = false;
+  nsCOMPtr<nsISupports> securityInfo;
+  bool noStore = false, noCache = false;
+  aChannel->GetSecurityInfo(getter_AddRefs(securityInfo));
  aChannel->IsNoStoreResponse(&noStore);
-  return noStore;
+  aChannel->IsNoCacheResponse(&noCache);
+
+  return (noStore || (noCache && securityInfo));
 }

 NS_IMETHODIMP