[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 6b3416ef0ff08646ca14a89ae8ba5938022eeed0
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 2 21:55:22 2002 +0000

    	- fixed bug where the address of an NSNumber object would be used for the port number
    
            * Panels.subproj/WebAuthenticationPanel.m: (-[WebAuthenticationPanel setUpForRequest:]):
    	Call intValue on the object returned from [NSURL port].
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 20b29e8..b2a323e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+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:]):
+	Call intValue on the object returned from [NSURL port].
+
 2002-11-01  Darin Adler  <darin at apple.com>
 
         * Plugins.subproj/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView sendEvent:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 20b29e8..b2a323e 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+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:]):
+	Call intValue on the object returned from [NSURL port].
+
 2002-11-01  Darin Adler  <darin at apple.com>
 
         * Plugins.subproj/WebBaseNetscapePluginView.m: (-[WebBaseNetscapePluginView sendEvent:]):
diff --git a/WebKit/Panels.subproj/WebAuthenticationPanel.m b/WebKit/Panels.subproj/WebAuthenticationPanel.m
index d1bfc7d..2b4f71a 100644
--- a/WebKit/Panels.subproj/WebAuthenticationPanel.m
+++ b/WebKit/Panels.subproj/WebAuthenticationPanel.m
@@ -105,7 +105,11 @@
     if ([resource isProxy]) {
         host = [resource proxyHost];
     } else {
-        host = [[resource URL] port] == 0 ? [[resource URL] host] : [NSString stringWithFormat:@"%@:%u", [[resource URL] host], [[resource URL] port]];
+        host = [[resource URL] host];
+        int port = [[[resource URL] port] intValue];
+        if (port) {
+            host = [NSString stringWithFormat:@"%@:%u", host, port];
+        }
     }
     
     NSString *message;

-- 
WebKit Debian packaging