Added authentication scheme as key to HttpAuthCache.

net/http/http_auth_cache.cc

-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_auth_cache.h"
 
 #include "base/logging.h"
 #include "base/string_util.h"
 
 namespace {
 
@@ skipping 41 matching lines @@
     return IsEnclosingPath(path, x);
   }
   const std::string& path;
 };
 
 } // namespace
 
 namespace net {
 
 // Performance: O(n), where n is the number of realm entries.
-HttpAuthCache::Entry* HttpAuthCache::LookupByRealm(const GURL& origin,
-                                                   const std::string& realm) {
+HttpAuthCache::Entry* HttpAuthCache::Lookup(const GURL& origin,
+                                            const std::string& realm,
+                                            const std::string& scheme) {
   CheckOriginIsValid(origin);
 
   // Linear scan through the realm entries.
   for (EntryList::iterator it = entries_.begin(); it != entries_.end(); ++it) {
-    if (it->origin() == origin && it->realm() == realm)
+    if (it->origin() == origin && it->realm() == realm &&
+        it->scheme() == scheme)
       return &(*it);
   }
   return NULL; // No realm entry found.
 }
 
 // Performance: O(n*m), where n is the number of realm entries, m is the number
 // of path entries per realm. Both n amd m are expected to be small; m is
 // kept small because AddPath() only keeps the shallowest entry.
 HttpAuthCache::Entry* HttpAuthCache::LookupByPath(const GURL& origin,
                                                   const std::string& path) {
@@ skipping 16 matching lines @@
 
 HttpAuthCache::Entry* HttpAuthCache::Add(const GURL& origin,
                                          HttpAuthHandler* handler,
                                          const std::wstring& username,
                                          const std::wstring& password,
                                          const std::string& path) {
   CheckOriginIsValid(origin);
   CheckPathIsValid(path);
 
   // Check for existing entry (we will re-use it if present).
-  HttpAuthCache::Entry* entry = LookupByRealm(origin, handler->realm());
+  HttpAuthCache::Entry* entry = Lookup(origin, handler->realm(),
+                                       handler->scheme());
 
   if (!entry) {
     // Failsafe to prevent unbounded memory growth of the cache.
     if (entries_.size() >= kMaxNumRealmEntries) {
       LOG(WARNING) << "Num auth cache entries reached limit -- evicting";
       entries_.pop_back();
     }
 
     entries_.push_front(Entry());
     entry = &entries_.front();
@@ skipping 31 matching lines @@
   for (PathList::const_iterator it = paths_.begin(); it != paths_.end();
        ++it) {
     if (IsEnclosingPath(*it, dir))
       return true;
   }
   return false;
 }
 
 bool HttpAuthCache::Remove(const GURL& origin,
                            const std::string& realm,
+                           const std::string& scheme,
                            const std::wstring& username,
                            const std::wstring& password) {
   for (EntryList::iterator it = entries_.begin(); it != entries_.end(); ++it) {
-    if (it->origin() == origin && it->realm() == realm) {
+    if (it->origin() == origin && it->realm() == realm &&
+        it->scheme() == scheme) {
       if (username == it->username() && password == it->password()) {
         entries_.erase(it);
         return true;
       }
       return false;
     }
   }
   return false;
 }
 
 } // namespace net