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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 47df1500ffbfb021e4fb6fe9dd7970789bea445a
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 14 04:44:08 2003 +0000

            Reviewed by Don.
    
    	- fixed 3293031 -- REGRESSION (83-84): extra entry in history when going to page that redirects (live365.com)
    
            * khtml/khtmlpart_p.h: Initialize m_executingJavaScriptFormAction to false.
            We had left it uninitialized when we fixed 3289047.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4550 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index eb09b8c..09fa43e 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-06-13  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3293031 -- REGRESSION (83-84): extra entry in history when going to page that redirects (live365.com)
+
+        * khtml/khtmlpart_p.h: Initialize m_executingJavaScriptFormAction to false.
+        We had left it uninitialized when we fixed 3289047.
+
 2003-06-13  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3292630, misrendered page because of bad doctype.  Add
@@ -27,10 +36,13 @@
 
 2003-06-13  Richard Williamson  <rjw at apple.com>
 
-        Reviewed by NOBODY (OOPS!).
+        Fixed 3291537.
+        Reviewed by John.
 
         * kwq/KWQObject.mm:
         (QObject::killTimer):
+        Only remove the timer is it hasn't fired (and is therefore valid).
+        It is NOT permissible to reference a timer's userInfo if it is invalid.
 
 === Safari-84 ===
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index eb09b8c..09fa43e 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-06-13  Darin Adler  <darin at apple.com>
+
+        Reviewed by Don.
+
+	- fixed 3293031 -- REGRESSION (83-84): extra entry in history when going to page that redirects (live365.com)
+
+        * khtml/khtmlpart_p.h: Initialize m_executingJavaScriptFormAction to false.
+        We had left it uninitialized when we fixed 3289047.
+
 2003-06-13  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3292630, misrendered page because of bad doctype.  Add
@@ -27,10 +36,13 @@
 
 2003-06-13  Richard Williamson  <rjw at apple.com>
 
-        Reviewed by NOBODY (OOPS!).
+        Fixed 3291537.
+        Reviewed by John.
 
         * kwq/KWQObject.mm:
         (QObject::killTimer):
+        Only remove the timer is it hasn't fired (and is therefore valid).
+        It is NOT permissible to reference a timer's userInfo if it is invalid.
 
 === Safari-84 ===
 
diff --git a/WebCore/khtml/khtmlpart_p.h b/WebCore/khtml/khtmlpart_p.h
index 7789c42..22566ae 100644
--- a/WebCore/khtml/khtmlpart_p.h
+++ b/WebCore/khtml/khtmlpart_p.h
@@ -160,6 +160,7 @@ public:
     m_delayRedirect = 0;
 
     m_bPendingChildRedirection = false;
+    m_executingJavaScriptFormAction = false;
 
     // inherit settings from parent
     if(parent && parent->inherits("KHTMLPart"))

-- 
WebKit Debian packaging