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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit 3af2e94aee5bb83623d5ff8ea27ec1b83e90a33a
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 14 04:01:58 2002 +0000

           Fixed 3051288.  URLs were not being canonicalized, so matching failed.
    
            * History.subproj/WebHistoryPrivate.m:
            (-[WebHistoryPrivate addEntry:]):
            (-[WebHistoryPrivate removeEntry:]):
            (-[WebHistoryPrivate containsURL:]):
            (-[WebHistoryPrivate entryForURL:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2070 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d0bd56d..ce36733 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,15 @@
 2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
 
+       Fixed 3051288.  URLs were not being canonicalized, so matching failed.
+        
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate addEntry:]):
+        (-[WebHistoryPrivate removeEntry:]):
+        (-[WebHistoryPrivate containsURL:]):
+        (-[WebHistoryPrivate entryForURL:]):
+
+2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
+
         Fixed 3050636.  90% solution.  The "Display Images Automatically"
         preference will be used to disallow image draggging.  So if this
         is set after pages have loaded, their images will not be draggable,
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d0bd56d..ce36733 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
 
+       Fixed 3051288.  URLs were not being canonicalized, so matching failed.
+        
+        * History.subproj/WebHistoryPrivate.m:
+        (-[WebHistoryPrivate addEntry:]):
+        (-[WebHistoryPrivate removeEntry:]):
+        (-[WebHistoryPrivate containsURL:]):
+        (-[WebHistoryPrivate entryForURL:]):
+
+2002-09-13  Richard Williamson (Home)  <rjw at apple.com>
+
         Fixed 3050636.  90% solution.  The "Display Images Automatically"
         preference will be used to disallow image draggging.  So if this
         is set after pages have loaded, their images will not be draggable,
diff --git a/WebKit/History.subproj/WebHistoryPrivate.m b/WebKit/History.subproj/WebHistoryPrivate.m
index e137f9b..a0f1d6d 100644
--- a/WebKit/History.subproj/WebHistoryPrivate.m
+++ b/WebKit/History.subproj/WebHistoryPrivate.m
@@ -143,7 +143,7 @@
 
     ASSERT_ARG(entry, [entry lastVisitedDate] != nil);
 
-    URLString = [[entry URL] absoluteString];
+    URLString = [[[entry URL] _web_canonicalize] absoluteString];
     [self removeEntryForURLString: URLString];
 
     if ([self findIndex: &dateIndex forDay: [entry lastVisitedDate]]) {
@@ -163,7 +163,7 @@
     WebHistoryItem *matchingEntry;
     NSString *URLString;
 
-    URLString = [[entry URL] absoluteString];
+    URLString = [[[entry URL] _web_canonicalize] absoluteString];
 
     // If this exact object isn't stored, then make no change.
     // FIXME: Is this the right behavior if this entry isn't present, but another entry for the same URL is?
@@ -293,12 +293,12 @@
 
 - (BOOL)containsURL: (NSURL *)URL
 {
-    return [self _entryForURLString:[URL absoluteString]] != nil;
+    return [self _entryForURLString:[[URL _web_canonicalize] absoluteString]] != nil;
 }
 
 - (WebHistoryItem *)entryForURL:(NSURL *)URL
 {
-    return [self _entryForURLString:[URL absoluteString]];
+    return [self _entryForURLString:[[URL _web_canonicalize] absoluteString]];
 }	
 
 #pragma mark ARCHIVING/UNARCHIVING

-- 
WebKit Debian packaging