Changeset 145581 in webkit

Timestamp:

Mar 12, 2013 2:10:45 PM (11 years ago)

Author:

ap@apple.com

Message:

Improve logging in ResourceHandleMac.mm
​https://bugs.webkit.org/show_bug.cgi?id=112185

Reviewed by Brady Eidson.

• platform/network/mac/ResourceHandleMac.mm: (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): Removed an obsolete #if. (WebCore::ResourceHandle::receivedCredential): (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential): (WebCore::ResourceHandle::receivedCancellation): (-[WebCoreResourceHandleAsDelegate connection:didCancelAuthenticationChallenge:]): Added a FIXME. (-[WebCoreResourceHandleAsDelegate connection:canAuthenticateAgainstProtectionSpace:]):

• platform/network/mac/ResourceResponseMac.mm: Removed an unneeded include.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/mac/ResourceHandleMac.mm (modified) (7 diffs)
• platform/network/mac/ResourceResponseMac.mm (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-03-12  Alexey Proskuryakov  <ap@apple.com>
+
+        Improve logging in ResourceHandleMac.mm
+        https://bugs.webkit.org/show_bug.cgi?id=112185
+
+        Reviewed by Brady Eidson.
+
+        * platform/network/mac/ResourceHandleMac.mm:
+        (WebCore::ResourceHandle::didReceiveAuthenticationChallenge): Removed an obsolete #if.
+        (WebCore::ResourceHandle::receivedCredential):
+        (WebCore::ResourceHandle::receivedRequestToContinueWithoutCredential):
+        (WebCore::ResourceHandle::receivedCancellation):
+        (-[WebCoreResourceHandleAsDelegate connection:didCancelAuthenticationChallenge:]): Added a FIXME.
+        (-[WebCoreResourceHandleAsDelegate connection:canAuthenticateAgainstProtectionSpace:]):
+
+        * platform/network/mac/ResourceResponseMac.mm: Removed an unneeded include.
+
 2013-03-12  Sheriff Bot  <webkit.review.bot@gmail.com>
 

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

@@ -455 +455 @@
     ASSERT(challenge.nsURLAuthenticationChallenge());
 
-#if PLATFORM(IOS) || __MAC_OS_X_VERSION_MIN_REQUIRED >= 1070
     // Proxy authentication is handled by CFNetwork internally. We can get here if the user cancels
     // CFNetwork authentication dialog, and we shouldn't ask the client to display another one in that case.
@@ -463 +462 @@
         return;
     }
-#endif
 
     if (!d->m_user.isNull() && !d->m_pass.isNull()) {
@@ -534 +532 @@
 void ResourceHandle::receivedCredential(const AuthenticationChallenge& challenge, const Credential& credential)
 {
+    LOG(Network, "Handle %p receivedCredential", this);
+
     ASSERT(!challenge.isNull());
     if (challenge != d->m_currentWebChallenge)
@@ -562 +562 @@
 void ResourceHandle::receivedRequestToContinueWithoutCredential(const AuthenticationChallenge& challenge)
 {
+    LOG(Network, "Handle %p receivedRequestToContinueWithoutCredential", this);
+
     ASSERT(!challenge.isNull());
     if (challenge != d->m_currentWebChallenge)
@@ -573 +575 @@
 void ResourceHandle::receivedCancellation(const AuthenticationChallenge& challenge)
 {
+    LOG(Network, "Handle %p receivedCancellation", this);
+
     if (challenge != d->m_currentWebChallenge)
         return;
@@ -675 +679 @@
 - (void)connection:(NSURLConnection *)connection didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
 {
+    // FIXME: We probably don't need to implement this (see <rdar://problem/8960124>).
+
     UNUSED_PARAM(connection);
 
@@ -687 +693 @@
 - (BOOL)connection:(NSURLConnection *)connection canAuthenticateAgainstProtectionSpace:(NSURLProtectionSpace *)protectionSpace
 {
-#if LOG_DISABLED
-    UNUSED_PARAM(connection);
-#endif
-
-    LOG(Network, "Handle %p delegate connection:%p canAuthenticateAgainstProtectionSpace:%p", m_handle, connection, protectionSpace);
+    UNUSED_PARAM(connection);
+
+    LOG(Network, "Handle %p delegate connection:%p canAuthenticateAgainstProtectionSpace:%@://%@:%u realm:%@ method:%@ %@%@", m_handle, connection, [protectionSpace protocol], [protectionSpace host], [protectionSpace port], [protectionSpace realm], [protectionSpace authenticationMethod], [protectionSpace isProxy] ? @"proxy:" : @"", [protectionSpace isProxy] ? [protectionSpace proxyType] : @"");
 
     if (!m_handle)

trunk/Source/WebCore/platform/network/mac/ResourceResponseMac.mm

@@ -31 +31 @@
 #import "WebCoreSystemInterface.h"
 #import <Foundation/Foundation.h>
+#import <limits>
 #import <wtf/StdLibExtras.h>
-#import <limits>
-#include <wtf/text/CString.h>
 
 using namespace std;