[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 a165b2da90b27fedd07f781d49fcec5e3d66a4a5
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 12 23:17:46 2003 +0000

    	Fixed 3412062.  Don't allow pages with the same URL as the current URL to enter b/f or history.
    
            Reviewed by Maciej.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _transitionToCommitted:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4979 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index bace8bd..8830911 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-09-12  Richard Williamson   <rjw at apple.com>
+
+	Fixed 3412062.  Don't allow pages with the same URL as the current URL to enter b/f or history.
+
+        Reviewed by Maciej.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _transitionToCommitted:]):
+
 2003-09-11  Maciej Stachowiak  <mjs at apple.com>
 
         Reviewed by Darin.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 4ec6532..6f52f2d 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -687,7 +687,8 @@ NSString *WebCorePageCacheStateKey = @"WebCorePageCacheState";
                 if (![ds _isClientRedirect]) {
                     // Add item to history.
 		    NSURL *URL = [[[ds _originalRequest] URL] _webkit_canonicalize];
-		    if (![URL _web_isEmpty] && ![WebDataProtocol _webIsDataProtocolURL:URL]) {
+		    if (![URL _web_isEmpty] && ![WebDataProtocol _webIsDataProtocolURL:URL] &&
+                        ![self _shouldTreatURLAsSameAsCurrent:URL]) {
 			entry = [[WebHistory optionalSharedHistory] addItemForURL:URL];
 			if (ptitle)
 			    [entry setTitle: ptitle];

-- 
WebKit Debian packaging