[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 edd9c1aeaff7d1a295a608951c4f293e249b3fd1
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Mar 17 17:53:14 2003 +0000

    WebFoundation:
    
            Reviewed by Trey.
    
    	- fixed 3199763 - Need to revise authentication API for form passwords
    	- fixed a bunch of crashing and wrongful Keychain saving bugs found while testing
    
            * AuthenticationManager.subproj/WebAuthenticatingResource.h:
            * AuthenticationManager.subproj/WebAuthenticatingResource.m:
            (-[WebAuthenticatingResourcePrivate dealloc]):
            (-[WebAuthenticatingResource _internalInit]):
            (-[WebAuthenticatingResource initWithURL:realm:receivesCredentialSecurely:]):
            (-[WebAuthenticatingResource initWithProxyHost:port:type:realm:receivesCredentialSecurely:]):
            (-[WebAuthenticatingResource initWithHTMLFormURL:]):
            (-[WebAuthenticatingResource isProxy]):
            (-[WebAuthenticatingResource isHTMLForm]):
            (-[WebAuthenticatingResource host]):
            (-[WebAuthenticatingResource port]):
            (-[WebAuthenticatingResource type]):
            (-[WebAuthenticatingResource hash]):
            (-[WebAuthenticatingResource isEqual:]):
            * AuthenticationManager.subproj/WebAuthenticationHandlerDispatcher.m:
            (-[WebAuthenticationHandlerDispatcher startAuthentication:]):
            * AuthenticationManager.subproj/WebAuthenticationManager.m:
            (-[WebAuthenticationManager _usernameForRealm:URL:]):
            (-[WebAuthenticationManager _removePasswordForRealm:URL:]):
            (-[WebAuthenticationManager _removeProxyPasswordForURL:]):
            (-[WebAuthenticationManager _proxyResourceForURL:]):
            (-[WebAuthenticationManager _setDefaultUserInfoFromURL:]):
            (-[WebAuthenticationManager _invokeHandlersWithURL:realm:forRequest:failureCount:withCallback:context:]):
            (-[WebAuthenticationManager _invokeHandlersWithURL:proxy:forRequest:failureCount:withCallback:context:]):
            (-[WebAuthenticationManager WebAuthenticationRequest:useCredential:]):
            * AuthenticationManager.subproj/WebAuthenticationRequest.h:
            * AuthenticationManager.subproj/WebAuthenticationRequest.m:
            (-[WebAuthenticationRequestPrivate initWithResource:defaultUsername:previousFailureCount:delegate:]):
            (-[WebAuthenticationRequestPrivate dealloc]):
            (-[WebAuthenticationRequest _initWithResource:defaultUsername:previousFailureCount:delegate:]):
            (-[WebAuthenticationRequest resource]):
            (-[WebAuthenticationRequest defaultUsername]):
            * AuthenticationManager.subproj/WebAuthenticationRequestPrivate.h:
            * AuthenticationManager.subproj/WebCredentialStorage.m:
            (-[WebCredentialStorage _rootResourceForResource:]):
            (-[WebCredentialStorage _resourceWithKeychainItem:isDefault:]):
            (-[WebCredentialStorage _saveCredential:forResource:isDefault:]):
            (-[WebCredentialStorage removeCredential:forResource:]):
            (-[WebCredentialStorage setDefaultCredential:forResource:]):
            * Misc.subproj/WebNSURLExtras.h:
            * Misc.subproj/WebNSURLExtras.m:
            (-[NSURL _web_URLByRemovingUserAndPath]):
    
    WebKit:
    
            Reviewed by Trey.
    
    	Adjusted for WebFoundation API changes.
    
            * Panels.subproj/WebAuthenticationPanel.m:
            (-[WebAuthenticationPanel setUpForRequest:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3846 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d9aac7d..9e28c12 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-03-17  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Trey.
+
+	Adjusted for WebFoundation API changes.
+	
+        * Panels.subproj/WebAuthenticationPanel.m:
+        (-[WebAuthenticationPanel setUpForRequest:]):
+
 2003-03-17  Darin Adler  <darin at apple.com>
 
         * English.lproj/StringsNotToBeLocalized.txt: Update for recent changes.
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 240d149..482f28c 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -94,27 +94,21 @@
 
     WebAuthenticatingResource *resource = [req resource];
 
-    // FIXME Radar 2876448: we should display a different dialog depending on the
-    // failure count (if the user tried and failed, the dialog should
-    // explain possible reasons)
-
-    NSString *realm = [resource realm];
-    NSString *proxyType = [resource proxyType];
     NSString *host;
-
-    if ([resource isProxy]) {
-        host = [resource proxyHost];
+    if ([resource port] == 0) {
+	host = [resource host];
     } else {
-        host = [[resource URL] _web_hostWithPort];
+	host = [NSString stringWithFormat:@"%@:%u", [resource host], [resource port]];
     }
-    
+
+    NSString *realm = [resource realm];
     NSString *message;
 
     if ([req previousFailureCount] == 0) {
         if ([resource isProxy]) {
             message = [NSString stringWithFormat:UI_STRING("To view this page, you need to log in to the %@ proxy server %@.",
                                                            "prompt string in authentication panel"),
-                proxyType, host];
+                [resource type], host];
         } else {
             message = [NSString stringWithFormat:UI_STRING("To view this page, you need to log in to area “%@” on %@.",
                                                            "prompt string in authentication panel"),
@@ -124,7 +118,7 @@
         if ([resource isProxy]) {
             message = [NSString stringWithFormat:UI_STRING("The name or password entered for the %@ proxy server %@ was incorrect. Please try again.",
                                                            "prompt string in authentication panel"),
-                proxyType, host];
+				[resource type], host];
         } else {
             message = [NSString stringWithFormat:UI_STRING("The name or password entered for area “%@” on %@ was incorrect. Please try again.",
                                                            "prompt string in authentication panel"),
@@ -145,8 +139,8 @@
                 "message in authentication panel")];
     }
 
-    if ([resource username] != nil) {
-        [username setStringValue:[resource username]];
+    if ([req defaultUsername] != nil) {
+        [username setStringValue:[req defaultUsername]];
         [panel setInitialFirstResponder:password];
     } else {
         [username setStringValue:@""];

-- 
WebKit Debian packaging