From c9317f4613605bc3744e69816c24c0ca36dcb245 Mon Sep 17 00:00:00 2001
From: Honza Bambas <honzab.moz@firemni.cz>
Date: Thu, 21 Aug 2014 15:50:16 -0700
Subject: [PATCH] Bug 1040086 - EV identifier missing when restoring session
 with HTTP cache v2.  r=michal

---
 netwerk/protocol/http/nsHttpChannel.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/netwerk/protocol/http/nsHttpChannel.cpp b/netwerk/protocol/http/nsHttpChannel.cpp
index 026f7f9325e..e9890fa6606 100644
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3655,6 +3655,11 @@ nsHttpChannel::CloseCacheEntry(bool doomOnFailure)
     if (doom) {
         LOG(("  dooming cache entry!!"));
         mCacheEntry->AsyncDoom(nullptr);
+    } else {
+      // Store updated security info, makes cached EV status race less likely
+      // (see bug 1040086)
+      if (mSecurityInfo)
+          mCacheEntry->SetSecurityInfo(mSecurityInfo);
     }
 
     mCachedResponseHead = nullptr;