[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 f8ba2eddb619ef6055bcc6b666e20af80fb61f26
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue May 28 23:17:36 2002 +0000

        Fixed edge case cancellation problem (actually happens a lot).
        No new loads are allowed after a data source has been
        set as "stopping".
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1229 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index a673b1a..97a9f6e 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
 2002-05-28  Richard Williamson  <rjw at apple.com>
 
+    Fixed edge case cancellation problem (actually happens a lot).
+    No new loads are allowed after a data source has been
+    set as "stopping".
+    
+	* kwq/KWQKloader.mm:
+	(Loader::servePendingRequests):
+	* kwq/external.h:
+
+2002-05-28  Richard Williamson  <rjw at apple.com>
+
     Fixed reporting of malformed resources URLs.  This fixed
     exceptions that were being thrown because nil handles were
     being added to datasource handle array.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index a673b1a..97a9f6e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
 2002-05-28  Richard Williamson  <rjw at apple.com>
 
+    Fixed edge case cancellation problem (actually happens a lot).
+    No new loads are allowed after a data source has been
+    set as "stopping".
+    
+	* kwq/KWQKloader.mm:
+	(Loader::servePendingRequests):
+	* kwq/external.h:
+
+2002-05-28  Richard Williamson  <rjw at apple.com>
+
     Fixed reporting of malformed resources URLs.  This fixed
     exceptions that were being thrown because nil handles were
     being added to datasource handle array.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index a673b1a..97a9f6e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
 2002-05-28  Richard Williamson  <rjw at apple.com>
 
+    Fixed edge case cancellation problem (actually happens a lot).
+    No new loads are allowed after a data source has been
+    set as "stopping".
+    
+	* kwq/KWQKloader.mm:
+	(Loader::servePendingRequests):
+	* kwq/external.h:
+
+2002-05-28  Richard Williamson  <rjw at apple.com>
+
     Fixed reporting of malformed resources URLs.  This fixed
     exceptions that were being thrown because nil handles were
     being added to datasource handle array.
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 0fb34b1..62e4821 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1258,6 +1258,12 @@ void Loader::servePendingRequests()
     KWQDEBUGLEVEL (KWQ_LOG_LOADING, "Serving request for base %s, url %s\n", 
           req->m_docLoader->part()->baseURL().url().latin1(), req->object->url().string().latin1());
     //job->begin(d->m_recv, job);
+    
+    if ([((URLLoadClient *)req->client)->m_dataSource _isStopping])
+    {
+        //NSLog (@"Attempt to start loading %@ during cancelation\n", QSTRING_TO_NSSTRING(req->object->url().string()));
+        return;
+    }
     job->begin((URLLoadClient *)req->client, job);
     if (job->handle() == nil){
         // Must be a malformed URL.
diff --git a/WebCore/kwq/KWQLoader.mm b/WebCore/kwq/KWQLoader.mm
index 0fb34b1..62e4821 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1258,6 +1258,12 @@ void Loader::servePendingRequests()
     KWQDEBUGLEVEL (KWQ_LOG_LOADING, "Serving request for base %s, url %s\n", 
           req->m_docLoader->part()->baseURL().url().latin1(), req->object->url().string().latin1());
     //job->begin(d->m_recv, job);
+    
+    if ([((URLLoadClient *)req->client)->m_dataSource _isStopping])
+    {
+        //NSLog (@"Attempt to start loading %@ during cancelation\n", QSTRING_TO_NSSTRING(req->object->url().string()));
+        return;
+    }
     job->begin((URLLoadClient *)req->client, job);
     if (job->handle() == nil){
         // Must be a malformed URL.
diff --git a/WebCore/kwq/KWQLoaderImpl.mm b/WebCore/kwq/KWQLoaderImpl.mm
index 0fb34b1..62e4821 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1258,6 +1258,12 @@ void Loader::servePendingRequests()
     KWQDEBUGLEVEL (KWQ_LOG_LOADING, "Serving request for base %s, url %s\n", 
           req->m_docLoader->part()->baseURL().url().latin1(), req->object->url().string().latin1());
     //job->begin(d->m_recv, job);
+    
+    if ([((URLLoadClient *)req->client)->m_dataSource _isStopping])
+    {
+        //NSLog (@"Attempt to start loading %@ during cancelation\n", QSTRING_TO_NSSTRING(req->object->url().string()));
+        return;
+    }
     job->begin((URLLoadClient *)req->client, job);
     if (job->handle() == nil){
         // Must be a malformed URL.
diff --git a/WebCore/kwq/external.h b/WebCore/kwq/external.h
index 7e580f1..e02a955 100644
--- a/WebCore/kwq/external.h
+++ b/WebCore/kwq/external.h
@@ -71,6 +71,7 @@
 - (void)_setTitle: (NSString *)title;
 - (void)_setFinalURL: (NSURL *)url;
 - (id <IFLocationChangeHandler>)_locationChangeHandler;
+- (BOOL)_isStopping;
 @end
 
 // This should not be allowed here.  data source should not reference view

-- 
WebKit Debian packaging