[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 e125ad8de8665da93ad55b1dd75b54e85e02b21f
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Sep 27 23:44:53 2002 +0000

    i        Fix 3058315:  crash in WebHTMLRepresentation receivedData:withDataSource
            http://www.u2.com/lite/ does some whacky things with its framset's onLoad
            handler.  The fix ensures that data isn't sent to the bridge once
            the bridge has been dealloced.
    
            * WebKit.pbproj/project.pbxproj: Nothing changed.  PB dorkiness.
            * WebView.subproj/WebHTMLRepresentation.m:
            (-[WebHTMLRepresentation receivedData:withDataSource:]):
    
            Fix related to 3058315.
    
            * LoadProgressMonitor.m:
            (-[LoadProgressMonitor receivedUpdateForKey:URLString:bytesLoaded:bytesExpected:error:dataSource:isComplete:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2192 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d52d394..9ea139d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-09-27  Richard Williamson   <rjw at apple.com>
+
+        Fix 3058315:  crash in WebHTMLRepresentation receivedData:withDataSource
+        http://www.u2.com/lite/ does some whacky things with its framset's onLoad
+        handler.  The fix ensures that data isn't sent to the bridge once
+        the bridge has been dealloced.
+        
+        * WebKit.pbproj/project.pbxproj: Nothing changed.  PB dorkiness.
+        * WebView.subproj/WebHTMLRepresentation.m:
+        (-[WebHTMLRepresentation receivedData:withDataSource:]):
+
 2002-09-27  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3056559 - QT plugin doesn't load (claudius)
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index d52d394..9ea139d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-09-27  Richard Williamson   <rjw at apple.com>
+
+        Fix 3058315:  crash in WebHTMLRepresentation receivedData:withDataSource
+        http://www.u2.com/lite/ does some whacky things with its framset's onLoad
+        handler.  The fix ensures that data isn't sent to the bridge once
+        the bridge has been dealloced.
+        
+        * WebKit.pbproj/project.pbxproj: Nothing changed.  PB dorkiness.
+        * WebView.subproj/WebHTMLRepresentation.m:
+        (-[WebHTMLRepresentation receivedData:withDataSource:]):
+
 2002-09-27  Chris Blumenberg  <cblu at apple.com>
 
 	Fixed: 3056559 - QT plugin doesn't load (claudius)
diff --git a/WebKit/WebKit.pbproj/project.pbxproj b/WebKit/WebKit.pbproj/project.pbxproj
index 84bbdc1..eb0d3e2 100644
--- a/WebKit/WebKit.pbproj/project.pbxproj
+++ b/WebKit/WebKit.pbproj/project.pbxproj
@@ -72,7 +72,6 @@
 				F58C8A07025BD3BC018635CA,
 				F531DDFF02F0C36F018635CA,
 			);
-			hasScannedForEncodings = 1;
 			isa = PBXProject;
 			knownRegions = (
 				English,
diff --git a/WebKit/WebView.subproj/WebHTMLRepresentation.m b/WebKit/WebView.subproj/WebHTMLRepresentation.m
index 04ba106..9af70f4 100644
--- a/WebKit/WebView.subproj/WebHTMLRepresentation.m
+++ b/WebKit/WebView.subproj/WebHTMLRepresentation.m
@@ -54,7 +54,8 @@
 
 - (void)receivedData:(NSData *)data withDataSource:(WebDataSource *)dataSource
 {
-    [_private->bridge receivedData:data withDataSource:dataSource];
+    if ([dataSource webFrame])
+        [_private->bridge receivedData:data withDataSource:dataSource];
 }
 
 - (void)receivedError:(WebError *)error withDataSource:(WebDataSource *)dataSource

-- 
WebKit Debian packaging