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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 28a821c58a1d8eed3780ed77d88b505884d2f01b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 2 22:00:35 2002 +0000

            * Panels.subproj/WebAuthenticationPanel.m: (-[WebAuthenticationPanel setUpForRequest:]):
    	Do the previous fix one better by using _web_hostWithPort.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index b2a323e..3793a59 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-02  Darin Adler  <darin at apple.com>
 
+        * Panels.subproj/WebAuthenticationPanel.m: (-[WebAuthenticationPanel setUpForRequest:]):
+	Do the previous fix one better by using _web_hostWithPort.
+
+2002-11-02  Darin Adler  <darin at apple.com>
+
 	- fixed bug where the address of an NSNumber object would be used for the port number
 
         * Panels.subproj/WebAuthenticationPanel.m: (-[WebAuthenticationPanel setUpForRequest:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index b2a323e..3793a59 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-11-02  Darin Adler  <darin at apple.com>
 
+        * Panels.subproj/WebAuthenticationPanel.m: (-[WebAuthenticationPanel setUpForRequest:]):
+	Do the previous fix one better by using _web_hostWithPort.
+
+2002-11-02  Darin Adler  <darin at apple.com>
+
 	- fixed bug where the address of an NSNumber object would be used for the port number
 
         * Panels.subproj/WebAuthenticationPanel.m: (-[WebAuthenticationPanel setUpForRequest:]):
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index 2b4f71a..2323bf5 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -9,11 +9,11 @@
 
 #import <WebFoundation/WebAssertions.h>
 #import <WebFoundation/WebLocalizableStrings.h>
+#import <WebFoundation/WebNSURLExtras.h>
 
 #import <WebKit/WebNSControlExtras.h>
 #import <WebKit/WebStandardPanelsPrivate.h>
 
-
 #define WebAuthenticationPanelNibName @"WebAuthenticationPanel"
 
 @implementation WebAuthenticationPanel
@@ -105,11 +105,7 @@
     if ([resource isProxy]) {
         host = [resource proxyHost];
     } else {
-        host = [[resource URL] host];
-        int port = [[[resource URL] port] intValue];
-        if (port) {
-            host = [NSString stringWithFormat:@"%@:%u", host, port];
-        }
+        host = [[resource URL] _web_hostWithPort];
     }
     
     NSString *message;

-- 
WebKit Debian packaging