Fix more fallout I wrought on myself by not testing the final authentication patch...
authorbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Sep 2009 23:08:44 +0000 (23:08 +0000)
committerbeidson@apple.com <beidson@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 14 Sep 2009 23:08:44 +0000 (23:08 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@48374 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/ChangeLog
WebCore/platform/network/cf/ResourceHandleCFNet.cpp
WebKitTools/ChangeLog
WebKitTools/DumpRenderTree/win/ResourceLoadDelegate.cpp

index ae35dc2..86686ec 100644 (file)
@@ -1,3 +1,14 @@
+2009-09-14  Brady Eidson  <beidson@apple.com>
+
+        Not reviewed, maybe should've been:
+
+        Cleaning up more Windows-specific fallout from the fix for:
+        <rdar://problem/7174050> and https://bugs.webkit.org/show_bug.cgi?id=29160
+
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::WebCoreSynchronousLoader::load): Don't allow empty CFStrings as the stored credentials,
+          as related checks all look at nullity when they really mean to be looking for emptiness. 
+
 2009-09-14  Anders Carlsson  <andersca@apple.com>
 
         Speculative Qt build fix.
index ff0e8a0..d6138da 100644 (file)
@@ -732,8 +732,10 @@ RetainPtr<CFDataRef> WebCoreSynchronousLoader::load(const ResourceRequest& reque
 
     KURL url = request.url();
 
-    loader.m_user.adoptCF(url.user().createCFString());
-    loader.m_pass.adoptCF(url.pass().createCFString());
+    if (url.user().length())
+        loader.m_user.adoptCF(url.user().createCFString());
+    if (url.pass().length())
+        loader.m_pass.adoptCF(url.pass().createCFString());
     loader.m_allowStoredCredentials = (storedCredentials == AllowStoredCredentials);
 
     // Take user/pass out of the URL.
index 744143a..7e87bfc 100644 (file)
@@ -1,3 +1,14 @@
+2009-09-14  Brady Eidson  <beidson@apple.com>
+
+        Not reviewed, maybe should've been:
+
+        Cleaning up more Windows-specific fallout from the fix for:
+        <rdar://problem/7174050> and https://bugs.webkit.org/show_bug.cgi?id=29160
+
+        * DumpRenderTree/win/ResourceLoadDelegate.cpp:
+        (ResourceLoadDelegate::didReceiveAuthenticationChallenge):  Correct printf() formatter, 
+          and call the correct method to get the Sender.
+
 2009-09-14  Jon Honeycutt  <jhoneycutt@apple.com>
 
         GTK build fix.
index 1d42aeb..0edf69b 100644 (file)
@@ -266,10 +266,10 @@ HRESULT STDMETHODCALLTYPE ResourceLoadDelegate::didReceiveAuthenticationChalleng
     const char* user = gLayoutTestController->authenticationUsername().c_str();
     const char* password = gLayoutTestController->authenticationPassword().c_str();
 
-    printf("%s - didReceiveAuthenticationChallenge - Responding with %s:%s\n", descriptionSuitableForTestResult(identifier).c_str(), user, password);
+    printf("%S - didReceiveAuthenticationChallenge - Responding with %s:%s\n", descriptionSuitableForTestResult(identifier).c_str(), user, password);
     
     COMPtr<IWebURLAuthenticationChallengeSender> sender;
-    if (!challenge || FAILED(challenge->QueryInterface(&sender)))
+    if (!challenge || FAILED(challenge->sender(&sender)))
         return E_FAIL;
         
     COMPtr<IWebURLCredential> credential;