[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 078630597cb73fb52f0f1633c5dfd7f6099f8d4b
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Oct 20 16:09:31 2002 +0000

    	- fixed 3076390 -- crash in DOM::DocumentImpl::setParsing loading thread detail page
    	at groups.apple.com
    
            * khtml/khtml_part.cpp: (KHTMLPart::openURL): Don't do any redirect special case
    	if the document is nil. Just do a normal load in that case.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2380 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index e090d6a..1d25a75 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,13 @@
 2002-10-20  Darin Adler  <darin at apple.com>
 
+	- fixed 3076390 -- crash in DOM::DocumentImpl::setParsing loading thread detail page
+	at groups.apple.com
+
+        * khtml/khtml_part.cpp: (KHTMLPart::openURL): Don't do any redirect special case
+	if the document is nil. Just do a normal load in that case.
+
+2002-10-20  Darin Adler  <darin at apple.com>
+
 	- fixed 3079864 -- REGRESSION: assertion failure on any page with a form element
 
         * khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::attach):
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index e090d6a..1d25a75 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,13 @@
 2002-10-20  Darin Adler  <darin at apple.com>
 
+	- fixed 3076390 -- crash in DOM::DocumentImpl::setParsing loading thread detail page
+	at groups.apple.com
+
+        * khtml/khtml_part.cpp: (KHTMLPart::openURL): Don't do any redirect special case
+	if the document is nil. Just do a normal load in that case.
+
+2002-10-20  Darin Adler  <darin at apple.com>
+
 	- fixed 3079864 -- REGRESSION: assertion failure on any page with a form element
 
         * khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::attach):
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index e090d6a..1d25a75 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,13 @@
 2002-10-20  Darin Adler  <darin at apple.com>
 
+	- fixed 3076390 -- crash in DOM::DocumentImpl::setParsing loading thread detail page
+	at groups.apple.com
+
+        * khtml/khtml_part.cpp: (KHTMLPart::openURL): Don't do any redirect special case
+	if the document is nil. Just do a normal load in that case.
+
+2002-10-20  Darin Adler  <darin at apple.com>
+
 	- fixed 3079864 -- REGRESSION: assertion failure on any page with a form element
 
         * khtml/html/html_formimpl.cpp: (HTMLGenericFormElementImpl::attach):
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index 591e3eb..0aa3b73 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -383,28 +383,30 @@ bool KHTMLPart::openURL( const KURL &url )
   // operation and d) the caller did not request to reload the page we try to
   // be smart and instead of reloading the whole document we just jump to the
   // request html anchor
-  bool isFrameSet = false;
-  if ( d->m_doc && d->m_doc->isHTMLDocument() ) {
-      HTMLDocumentImpl* htmlDoc = static_cast<HTMLDocumentImpl*>(d->m_doc);
-      isFrameSet = htmlDoc->body() && (htmlDoc->body()->id() == ID_FRAMESET);
-  }
-  if ( !isFrameSet &&
-       urlcmp( url.url(), m_url.url(), true, true ) &&
-       url.hasRef() && !args.doPost() && !args.reload )
-  {
-    kdDebug( 6050 ) << "KHTMLPart::openURL, jumping to anchor. m_url = " << url.url() << endl;
-    m_url = url;
-    emit started( 0L );
+  if (d->m_doc) {
+      bool isFrameSet = false;
+      if ( d->m_doc->isHTMLDocument() ) {
+          HTMLDocumentImpl* htmlDoc = static_cast<HTMLDocumentImpl*>(d->m_doc);
+          isFrameSet = htmlDoc->body() && (htmlDoc->body()->id() == ID_FRAMESET);
+      }
+      if ( !isFrameSet &&
+           urlcmp( url.url(), m_url.url(), true, true ) &&
+           url.hasRef() && !args.doPost() && !args.reload )
+      {
+        kdDebug( 6050 ) << "KHTMLPart::openURL, jumping to anchor. m_url = " << url.url() << endl;
+        m_url = url;
+        emit started( 0L );
 
-    if ( !gotoAnchor( url.encodedHtmlRef()) )
-       gotoAnchor( url.htmlRef() );
+        if ( !gotoAnchor( url.encodedHtmlRef()) )
+           gotoAnchor( url.htmlRef() );
 
-    d->m_bComplete = true;
-    d->m_doc->setParsing(false);
+        d->m_bComplete = true;
+        d->m_doc->setParsing(false);
 
-    kdDebug( 6050 ) << "completed..." << endl;
-    emit completed();
-    return true;
+        kdDebug( 6050 ) << "completed..." << endl;
+        emit completed();
+        return true;
+      }
   }
 
   if (!d->m_restored)

-- 
WebKit Debian packaging