Fixes bug 75354 "https content is being cached on disk!!" r=bbaetz, sr=dougt

netwerk/protocol/http/src/nsHTTPChannel.cpp

@@ -168,7 +168,7 @@ nsHTTPChannel::nsHTTPChannel(nsIURI *aURL, nsHTTPHandler *aHandler)
 
     PRBool isHTTPS = PR_FALSE;
     if (NS_SUCCEEDED(mURI->SchemeIs("https", &isHTTPS)) && isHTTPS)
-        mLoadFlags |= nsIRequest::INHIBIT_PERSISTENT_CACHING; 
+        mLoadFlags |= INHIBIT_PERSISTENT_CACHING; 
 }
 
 nsHTTPChannel::~nsHTTPChannel()
@@ -397,6 +397,11 @@ NS_IMETHODIMP
 nsHTTPChannel::SetLoadFlags(PRUint32 aLoadFlags)
 {
     mLoadFlags = aLoadFlags;
+
+    PRBool isHTTPS = PR_FALSE;
+    if (NS_SUCCEEDED(mURI->SchemeIs("https", &isHTTPS)) && isHTTPS)
+        mLoadFlags |= INHIBIT_PERSISTENT_CACHING; 
+
     return NS_OK;
 }
 
@@ -1413,9 +1418,9 @@ nsHTTPChannel::CheckCache()
             return rv;
 
         PRUint32 cacheFlags;
-        if (mLoadFlags & nsIRequest::CACHE_AS_FILE)
+        if (mLoadFlags & CACHE_AS_FILE)
             cacheFlags = nsINetDataCacheManager::CACHE_AS_FILE;
-        else if (mLoadFlags & nsIRequest::INHIBIT_PERSISTENT_CACHING)
+        else if (mLoadFlags & INHIBIT_PERSISTENT_CACHING)
             cacheFlags = nsINetDataCacheManager::BYPASS_PERSISTENT_CACHE;
         else
             cacheFlags = 0;
@@ -2672,7 +2677,7 @@ nsHTTPChannel::Authenticate(const char *aChallenge, PRBool aProxyAuth)
     // not cached, except perhaps in the memory cache.
     // XXX if we had username and passwd in user-auth, and the interaction
     // XXX was standard, then it's safe to cache, I think (shaver)
-    mLoadFlags |= nsIRequest::INHIBIT_PERSISTENT_CACHING;
+    mLoadFlags |= INHIBIT_PERSISTENT_CACHING;
 
     // This smells like a clone function... maybe there is a 
     // benefit in doing that, think. TODO.