[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 43d86d1b44fdab586422eaef6d2e9db60f61fdc6
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 00:26:18 2004 +0000

            Reviewed by John.
    
    	<rdar://problem/3632570>: (REGRESSION: SocialText.net wiki keeps asking for auth, even though pages load)
    
            * Misc.subproj/WebIconLoader.m:
            (-[WebIconLoader didReceiveAuthenticationChallenge:]): Ignore the challenge - we don't
    	want an auth panel for favicons.
            (-[WebIconLoader didCancelAuthenticationChallenge:]): Ignore cancel, since we are ignoring
    	the challenge.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7014 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bedbed8..78f0c80 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,15 @@
+2004-07-12  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by John.
+
+	<rdar://problem/3632570>: (REGRESSION: SocialText.net wiki keeps asking for auth, even though pages load)
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader didReceiveAuthenticationChallenge:]): Ignore the challenge - we don't
+	want an auth panel for favicons.
+        (-[WebIconLoader didCancelAuthenticationChallenge:]): Ignore cancel, since we are ignoring
+	the challenge.
+
 2004-07-09  Chris Blumenberg  <cblu at apple.com>
 	
 	Allowed my change for 3715785 to compile on Jaguar.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 28d4e9e..6d3955b 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -94,4 +94,15 @@
     [super didFinishLoading];
 }
 
+// We don't ever want to prompt for authentication just for a site icon, so
+// override this WebBaseResourceDelegate method to refuse the challenge
+- (void)didReceiveAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+    [[challenge sender] cancelAuthenticationChallenge:challenge];
+}
+
+- (void)didCancelAuthenticationChallenge:(NSURLAuthenticationChallenge *)challenge
+{
+}
+
 @end

-- 
WebKit Debian packaging