[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 8dbcbb4e1dec0bfb41ea27315a881abf3bb9db83
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed May 29 00:00:42 2002 +0000

        Moved cancellation check before creation on job instance,
        preventing leak.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1231 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 97a9f6e..aa2249a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-05-28  Richard Williamson  <rjw at apple.com>
 
+    Moved cancellation check before creation on job instance,
+    preventing leak.
+    
+	* kwq/KWQKloader.mm:
+	(Loader::servePendingRequests):
+
+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".
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 97a9f6e..aa2249a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-05-28  Richard Williamson  <rjw at apple.com>
 
+    Moved cancellation check before creation on job instance,
+    preventing leak.
+    
+	* kwq/KWQKloader.mm:
+	(Loader::servePendingRequests):
+
+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".
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 97a9f6e..aa2249a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-05-28  Richard Williamson  <rjw at apple.com>
 
+    Moved cancellation check before creation on job instance,
+    preventing leak.
+    
+	* kwq/KWQKloader.mm:
+	(Loader::servePendingRequests):
+
+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".
diff --git a/WebCore/kwq/KWQKloader.mm b/WebCore/kwq/KWQKloader.mm
index 62e4821..d83686e 100644
--- a/WebCore/kwq/KWQKloader.mm
+++ b/WebCore/kwq/KWQKloader.mm
@@ -1252,6 +1252,13 @@ void Loader::servePendingRequests()
     kdDebug( 6060 ) << "starting Loader url=" << req->object->url().string() << endl;
     #endif
     
+    // Don't attempt to load resources if we're cancelling this document.
+    if ([((URLLoadClient *)req->client)->m_dataSource _isStopping])
+    {
+        //NSLog (@"Attempt to start loading %@ during cancelation\n", QSTRING_TO_NSSTRING(req->object->url().string()));
+        return;
+    }
+
     KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
     
 #ifdef APPLE_CHANGES
@@ -1259,11 +1266,6 @@ void Loader::servePendingRequests()
           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 62e4821..d83686e 100644
--- a/WebCore/kwq/KWQLoader.mm
+++ b/WebCore/kwq/KWQLoader.mm
@@ -1252,6 +1252,13 @@ void Loader::servePendingRequests()
     kdDebug( 6060 ) << "starting Loader url=" << req->object->url().string() << endl;
     #endif
     
+    // Don't attempt to load resources if we're cancelling this document.
+    if ([((URLLoadClient *)req->client)->m_dataSource _isStopping])
+    {
+        //NSLog (@"Attempt to start loading %@ during cancelation\n", QSTRING_TO_NSSTRING(req->object->url().string()));
+        return;
+    }
+
     KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
     
 #ifdef APPLE_CHANGES
@@ -1259,11 +1266,6 @@ void Loader::servePendingRequests()
           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 62e4821..d83686e 100644
--- a/WebCore/kwq/KWQLoaderImpl.mm
+++ b/WebCore/kwq/KWQLoaderImpl.mm
@@ -1252,6 +1252,13 @@ void Loader::servePendingRequests()
     kdDebug( 6060 ) << "starting Loader url=" << req->object->url().string() << endl;
     #endif
     
+    // Don't attempt to load resources if we're cancelling this document.
+    if ([((URLLoadClient *)req->client)->m_dataSource _isStopping])
+    {
+        //NSLog (@"Attempt to start loading %@ during cancelation\n", QSTRING_TO_NSSTRING(req->object->url().string()));
+        return;
+    }
+
     KIO::TransferJob* job = KIO::get( req->object->url().string(), req->object->reload(), false /*no GUI*/);
     
 #ifdef APPLE_CHANGES
@@ -1259,11 +1266,6 @@ void Loader::servePendingRequests()
           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.

-- 
WebKit Debian packaging