Bug 1040086 - EV identifier missing when restoring session with HTTP cache v2. r=michal, a=lmandel
authorHonza Bambas <honzab.moz@firemni.cz>
Thu, 21 Aug 2014 15:50:16 -0700
changeset 209458 33ea2d7e342ece7ea41df93f7e76417ad51d4d77
parent 209457 8f49d60bf5c9176c88d6aaf6c985226f8b2e93f6
child 209459 2f61f6e44a3333b3d267bb833836ce50873f71f8
push id494
push userraliiev@mozilla.com
push dateMon, 25 Aug 2014 18:42:16 +0000
treeherdermozilla-release@a3cc3e46b571 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmichal, lmandel
bugs1040086
milestone32.0
Bug 1040086 - EV identifier missing when restoring session with HTTP cache v2. r=michal, a=lmandel
netwerk/protocol/http/nsHttpChannel.cpp
--- a/netwerk/protocol/http/nsHttpChannel.cpp
+++ b/netwerk/protocol/http/nsHttpChannel.cpp
@@ -3645,16 +3645,21 @@ nsHttpChannel::CloseCacheEntry(bool doom
             doom = true;
     }
     else if (mCacheEntryIsWriteOnly)
         doom = true;
 
     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;
 
     mCachePump = nullptr;
     mCacheEntry = nullptr;
     mCacheEntryIsWriteOnly = false;
     mInitedCacheEntry = false;