Changeset 42536 in webkit

Timestamp:

Apr 14, 2009, 11:43:35 PM (16 years ago)

Author:

ap@webkit.org

Message:

Rubber-stamped by Darin Adler.

Don't keep platform objects for authentication challenge in ResourceHandleInternal.
We already have a copy in AuthenticationChallenge object.

• platform/network/ResourceHandle.cpp: (WebCore::ResourceHandle::clearAuthentication):
• platform/network/ResourceHandleInternal.h: (WebCore::ResourceHandleInternal::ResourceHandleInternal):
• platform/network/cf/ResourceHandleCFNet.cpp: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): (WebCore::ResourceHandle::receivedCredential): (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential): (WebCore::ResourceHandle::receivedCancellation):
• platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): (WebCore::ResourceHandle::didCancelAuthenticationChallenge): (WebCore::ResourceHandle::receivedCredential): (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential): (WebCore::ResourceHandle::receivedCancellation):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/ResourceHandle.cpp (modified) (1 diff)
• platform/network/ResourceHandleInternal.h (modified) (2 diffs)
• platform/network/cf/ResourceHandleCFNet.cpp (modified) (5 diffs)
• platform/network/mac/ResourceHandleMac.mm (modified) (8 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-14  Alexey Proskuryakov  <ap@webkit.org>
+
+        Rubber-stamped by Darin Adler.
+
+        Don't keep platform objects for authentication challenge in ResourceHandleInternal.
+        We already have a copy in AuthenticationChallenge object.
+
+        * platform/network/ResourceHandle.cpp:
+        (WebCore::ResourceHandle::clearAuthentication):
+        * platform/network/ResourceHandleInternal.h:
+        (WebCore::ResourceHandleInternal::ResourceHandleInternal):
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+        (WebCore::ResourceHandle::receivedCredential):
+        (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential):
+        (WebCore::ResourceHandle::receivedCancellation):
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::didReceiveAuthenticationChallenge):
+        (WebCore::ResourceHandle::didCancelAuthenticationChallenge):
+        (WebCore::ResourceHandle::receivedCredential):
+        (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential):
+        (WebCore::ResourceHandle::receivedCancellation):
+
 2009-04-14  Geoffrey Garen  <ggaren@apple.com>
 

trunk/WebCore/platform/network/ResourceHandle.cpp

@@ -104 +104 @@
 void ResourceHandle::clearAuthentication()
 {
-#if PLATFORM(MAC)
-    d->m_currentMacChallenge = nil;
-#elif USE(CFNETWORK)
-    d->m_currentCFChallenge = 0;
-#endif
-    d->m_currentWebChallenge.nullify();
+    d->m_currentChallenge.nullify();
 }
 

trunk/WebCore/platform/network/ResourceHandleInternal.h

@@ -128 +128 @@
 #if PLATFORM(MAC)
             , m_startWhenScheduled(false)
-            , m_currentMacChallenge(nil)
-#elif USE(CFNETWORK)
-            , m_currentCFChallenge(0)
 #endif
             , m_failureTimer(loader, &ResourceHandle::fireFailure)
@@ -210 +207 @@
         QWebFrame* m_frame;
 #endif
-#if PLATFORM(MAC)
-        NSURLAuthenticationChallenge *m_currentMacChallenge;
-#endif
-#if USE(CFNETWORK)
-        CFURLAuthChallengeRef m_currentCFChallenge;
-#endif
-        AuthenticationChallenge m_currentWebChallenge;
+        AuthenticationChallenge m_currentChallenge;
 
         ResourceHandle::FailureType m_failureType;

trunk/WebCore/platform/network/cf/ResourceHandleCFNet.cpp

@@ -410 +410 @@
 {
     LOG(Network, "CFNet - didReceiveAuthenticationChallenge()");
-    ASSERT(!d->m_currentCFChallenge);
-    ASSERT(d->m_currentWebChallenge.isNull());
+    ASSERT(d->m_currentChallenge.isNull());
     // Since CFURLConnection networking relies on keeping a reference to the original CFURLAuthChallengeRef,
     // we make sure that is actually present
@@ -438 +437 @@
     }
 
-    d->m_currentCFChallenge = challenge.cfURLAuthChallengeRef();
-    d->m_currentWebChallenge = AuthenticationChallenge(d->m_currentCFChallenge, this);
+    d->m_currentChallenge = AuthenticationChallenge(challenge.cfURLAuthChallengeRef(), this);
     
     if (client())
-        client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
+        client()->didReceiveAuthenticationChallenge(this, d->m_currentChallenge);
 }
 
@@ -450 +448 @@
     ASSERT(!challenge.isNull());
     ASSERT(challenge.cfURLAuthChallengeRef());
-    if (challenge != d->m_currentWebChallenge)
+    if (challenge != d->m_currentChallenge)
         return;
 
@@ -473 +471 @@
     ASSERT(!challenge.isNull());
     ASSERT(challenge.cfURLAuthChallengeRef());
-    if (challenge != d->m_currentWebChallenge)
+    if (challenge != d->m_currentChallenge)
         return;
 
@@ -484 +482 @@
 {
     LOG(Network, "CFNet - receivedCancellation()");
-    if (challenge != d->m_currentWebChallenge)
+    if (challenge != d->m_currentChallenge)
         return;
 

trunk/WebCore/platform/network/mac/ResourceHandleMac.mm

@@ -407 +407 @@
 void ResourceHandle::didReceiveAuthenticationChallenge(const AuthenticationChallenge& challenge)
 {
-    ASSERT(!d->m_currentMacChallenge);
-    ASSERT(d->m_currentWebChallenge.isNull());
+    ASSERT(d->m_currentChallenge.isNull());
     // Since NSURLConnection networking relies on keeping a reference to the original NSURLAuthenticationChallenge,
     // we make sure that is actually present
@@ -417 +416 @@
                                                                    password:d->m_pass
                                                                 persistence:NSURLCredentialPersistenceNone];
-        d->m_currentMacChallenge = challenge.nsURLAuthenticationChallenge();
-        d->m_currentWebChallenge = challenge;
+        d->m_currentChallenge = challenge;
         receivedCredential(challenge, core(credential));
         [credential release];
@@ -435 +433 @@
     }
 
-    d->m_currentMacChallenge = challenge.nsURLAuthenticationChallenge();
-    NSURLAuthenticationChallenge *webChallenge = [[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:d->m_currentMacChallenge 
+    NSURLAuthenticationChallenge *webChallenge = [[NSURLAuthenticationChallenge alloc] initWithAuthenticationChallenge:challenge.nsURLAuthenticationChallenge() 
                                                                                        sender:(id<NSURLAuthenticationChallengeSender>)delegate()];
-    d->m_currentWebChallenge = core(webChallenge);
+    d->m_currentChallenge = core(webChallenge);
     [webChallenge release];
 
     if (client())
-        client()->didReceiveAuthenticationChallenge(this, d->m_currentWebChallenge);
+        client()->didReceiveAuthenticationChallenge(this, d->m_currentChallenge);
 }
 
 void ResourceHandle::didCancelAuthenticationChallenge(const AuthenticationChallenge& challenge)
 {
-    ASSERT(d->m_currentMacChallenge);
-    ASSERT(!d->m_currentWebChallenge.isNull());
-    ASSERT(d->m_currentWebChallenge == challenge);
+    ASSERT(!d->m_currentChallenge.isNull());
+    ASSERT(d->m_currentChallenge == challenge);
 
     if (client())
@@ -458 +454 @@
 {
     ASSERT(!challenge.isNull());
-    if (challenge != d->m_currentWebChallenge)
-        return;
+    if (challenge != d->m_currentChallenge)
+        return;
+
+    NSURLAuthenticationChallenge *currentMacChallenge = challenge.nsURLAuthenticationChallenge();
 
 #ifdef BUILDING_ON_TIGER
@@ -465 +463 @@
         // NSURLCredentialPersistenceNone doesn't work on Tiger, so we have to use session persistence.
         Credential webCredential(credential.user(), credential.password(), CredentialPersistenceForSession);
-        WebCoreCredentialStorage::set(mac(webCredential), [d->m_currentMacChallenge protectionSpace]);
-        [[d->m_currentMacChallenge sender] useCredential:mac(webCredential) forAuthenticationChallenge:d->m_currentMacChallenge];
+        WebCoreCredentialStorage::set(mac(webCredential), [currentMacChallenge protectionSpace]);
+        [[currentMacChallenge sender] useCredential:mac(webCredential) forAuthenticationChallenge:currentMacChallenge];
     } else
 #else
@@ -473 +471 @@
         // to ignore it for a particular request (short of removing it altogether).
         Credential webCredential(credential.user(), credential.password(), CredentialPersistenceNone);
-        WebCoreCredentialStorage::set(mac(webCredential), [d->m_currentMacChallenge protectionSpace]);
-        [[d->m_currentMacChallenge sender] useCredential:mac(webCredential) forAuthenticationChallenge:d->m_currentMacChallenge];
+        WebCoreCredentialStorage::set(mac(webCredential), [currentMacChallenge protectionSpace]);
+        [[currentMacChallenge sender] useCredential:mac(webCredential) forAuthenticationChallenge:currentMacChallenge];
     } else
 #endif
-        [[d->m_currentMacChallenge sender] useCredential:mac(credential) forAuthenticationChallenge:d->m_currentMacChallenge];
+        [[currentMacChallenge sender] useCredential:mac(credential) forAuthenticationChallenge:currentMacChallenge];
 
     clearAuthentication();
@@ -485 +483 @@
 {
     ASSERT(!challenge.isNull());
-    if (challenge != d->m_currentWebChallenge)
-        return;
-
-    [[d->m_currentMacChallenge sender] continueWithoutCredentialForAuthenticationChallenge:d->m_currentMacChallenge];
+    if (challenge != d->m_currentChallenge)
+        return;
+
+    NSURLAuthenticationChallenge *currentMacChallenge = challenge.nsURLAuthenticationChallenge();
+    [[currentMacChallenge sender] continueWithoutCredentialForAuthenticationChallenge:currentMacChallenge];
 
     clearAuthentication();
@@ -495 +494 @@
 void ResourceHandle::receivedCancellation(const AuthenticationChallenge& challenge)
 {
-    if (challenge != d->m_currentWebChallenge)
+    if (challenge != d->m_currentChallenge)
         return;