Reviewed by Darin

        <rdar://problem/5771227> - Incorrect password handling text in credential sheet

        * platform/network/ProtectionSpace.cpp:
        (WebCore::ProtectionSpace::receivesCredentialSecurely): Call functional CFNetwork method to
          get "secureness" of the auth challenge instead of figuring it out ourselves

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@30689 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index df9c37041a59ca66c985bab512bb2814af8a1cae..fbbb24c499552662602ec1c7d8905456b83d099b 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2008-02-29  Brady Eidson  <beidson@apple.com>
+
+        Reviewed by Darin
+        
+        <rdar://problem/5771227> - Incorrect password handling text in credential sheet
+
+        * platform/network/ProtectionSpace.cpp:
+        (WebCore::ProtectionSpace::receivesCredentialSecurely): Call functional CFNetwork method to 
+          get "secureness" of the auth challenge instead of figuring it out ourselves
+
 2008-02-29  Brent Fulgham  <bfulgham@gmail.com>
 
         http://bugs.webkit.org/show_bug.cgi?id=17483

diff --git a/WebCore/platform/network/ProtectionSpace.cpp b/WebCore/platform/network/ProtectionSpace.cpp
index a6aa75ac1613477b410aa3dbb6a5cccbe22ab926..d0020c15d16bda225b821c9989a1e4b919a22d1c 100644 (file)
--- a/WebCore/platform/network/ProtectionSpace.cpp
+++ b/WebCore/platform/network/ProtectionSpace.cpp
@@ -25,6 +25,10 @@
 #include "config.h"
 #include "ProtectionSpace.h"
 
+#include "AuthenticationCF.h"
+#include <CFNetwork/CFURLProtectionSpacePriv.h>
+#include <wtf/RetainPtr.h>
+
 namespace WebCore {
 
 // Need to enforce empty, non-null strings due to the pickiness of the String == String operator
@@ -81,10 +85,8 @@ ProtectionSpaceAuthenticationScheme ProtectionSpace::authenticationScheme() cons
 
 bool ProtectionSpace::receivesCredentialSecurely() const
 {
-    return (m_serverType == ProtectionSpaceServerHTTPS ||
-            m_serverType == ProtectionSpaceServerFTPS ||
-            m_serverType == ProtectionSpaceProxyHTTPS ||
-            m_authenticationScheme == ProtectionSpaceAuthenticationSchemeHTTPDigest);
+    RetainPtr<CFURLProtectionSpaceRef> cfSpace(AdoptCF, createCF(*this));
+    return cfSpace && CFURLProtectionSpaceReceivesCredentialSecurely(cfSpace.get());
 }
 
 bool operator==(const ProtectionSpace& a, const ProtectionSpace& b)