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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit 4b23da8e9f4f49b86735f663040ba70b7a93ecbd
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 11 22:48:09 2003 +0000

    	Fixed: <rdar://problem/3288097>: REGRESSION: assertion failure after hitting back while loading page after fragment scroll
    
            Fixed by darin, reviewed by me.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _URLsMatchItem:]): ignore the URL fragment so we scroll back at the current page instead of attempt to load the current page
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4524 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 9041851..618cd15 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-06-11  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3288097>: REGRESSION: assertion failure after hitting back while loading page after fragment scroll
+
+        Fixed by darin, reviewed by me.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _URLsMatchItem:]): ignore the URL fragment so we scroll back at the current page instead of attempt to load the current page 
+        
 2003-06-11  Darin Adler  <darin at apple.com>
 
         Reviewed by John.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index be4b74f..155e30d 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1122,7 +1122,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 {
     NSURL *currentURL = [[[self dataSource] request] URL];
 
-    if (![[item URL] isEqual: currentURL])
+    if (![[[item URL] _web_URLByRemovingFragment] isEqual:[currentURL _web_URLByRemovingFragment]])
         return NO;
     
     NSArray *childItems = [item children];

-- 
WebKit Debian packaging