From 69fdc31f3f601e37583ddb0b50b8f76ff4424524 Mon Sep 17 00:00:00 2001
From: "darin%netscape.com"
 <darin%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Mon, 3 Jun 2002 20:05:53 +0000
Subject: [PATCH] fixes bug 136210 "cannot view any https urls when memory
 cache size is set to 0" r=beard sr=rpotts

git-svn-id: svn://10.0.0.236/trunk@122574 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/netwerk/cache/src/nsCacheService.cpp | 34 ++++++++++++--------
 mozilla/netwerk/cache/src/nsCacheService.h   |  2 ++
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/mozilla/netwerk/cache/src/nsCacheService.cpp b/mozilla/netwerk/cache/src/nsCacheService.cpp
index 0a2062cb94e..a1f13cfed1f 100644
--- a/mozilla/netwerk/cache/src/nsCacheService.cpp
+++ b/mozilla/netwerk/cache/src/nsCacheService.cpp
@@ -562,22 +562,26 @@ nsCacheService::IsStorageEnabledForPolicy(nsCacheStoragePolicy  storagePolicy,
 {
     if (gService == nsnull) return NS_ERROR_NOT_AVAILABLE;
     nsAutoLock lock(gService->mCacheServiceLock);
-        
-    if (gService->mEnableMemoryDevice &&
+
+    *result = gService->IsStorageEnabledForPolicy_Locked(storagePolicy);
+    return NS_OK;
+}
+
+PRBool        
+nsCacheService::IsStorageEnabledForPolicy_Locked(nsCacheStoragePolicy  storagePolicy)
+{
+    if (mEnableMemoryDevice &&
         (storagePolicy == nsICache::STORE_ANYWHERE ||
          storagePolicy == nsICache::STORE_IN_MEMORY)) {
-        *result = PR_TRUE;   
+        return PR_TRUE;
     }
-    else if (gService->mEnableDiskDevice &&
-             (storagePolicy == nsICache::STORE_ANYWHERE ||
-              storagePolicy == nsICache::STORE_ON_DISK  ||
-              storagePolicy == nsICache::STORE_ON_DISK_AS_FILE)) {
-        *result = PR_TRUE;         
-    } else {
-        *result = PR_FALSE;
+    if (mEnableDiskDevice &&
+        (storagePolicy == nsICache::STORE_ANYWHERE ||
+         storagePolicy == nsICache::STORE_ON_DISK  ||
+         storagePolicy == nsICache::STORE_ON_DISK_AS_FILE)) {
+        return PR_TRUE;
     }
-    
-    return NS_OK;
+    return PR_FALSE;
 }
 
 
@@ -839,9 +843,11 @@ nsCacheService::ActivateEntry(nsCacheRequest * request,
     if (result) *result = nsnull;
     if ((!request) || (!result))  return NS_ERROR_NULL_POINTER;
 
-    if (!mEnableMemoryDevice && (!mEnableDiskDevice || !request->IsStreamBased() ))
+    // check if the request can be satisfied
+    if (!mEnableMemoryDevice && !request->IsStreamBased())
+        return NS_ERROR_FAILURE;
+    if (!IsStorageEnabledForPolicy_Locked(request->StoragePolicy()))
         return NS_ERROR_FAILURE;
-
 
     // search active entries (including those not bound to device)
     nsCacheEntry *entry = mActiveEntries.GetEntry(request->mKey);
diff --git a/mozilla/netwerk/cache/src/nsCacheService.h b/mozilla/netwerk/cache/src/nsCacheService.h
index 814d0171067..bba9d0badf1 100644
--- a/mozilla/netwerk/cache/src/nsCacheService.h
+++ b/mozilla/netwerk/cache/src/nsCacheService.h
@@ -164,6 +164,8 @@ private:
     void             ClearActiveEntries(void);
     void             DoomActiveEntries(void);
 
+    PRBool           IsStorageEnabledForPolicy_Locked(nsCacheStoragePolicy policy);
+
     static
     PLDHashOperator PR_CALLBACK  DeactivateAndClearEntry(PLDHashTable *    table,
                                                          PLDHashEntryHdr * hdr,