[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 a55a8784d24141f81e6e219434d6c57d8b779b41
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sun Sep 22 05:52:15 2002 +0000

    	Fix crashing part of 3057265 -- REGRESSION: Crash loading http://www.undetectables.co.uk/
    
            * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
    	Remove special case for javascript and about:blank that was leading to a crash.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2116 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index b0ba378..b90c518 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,12 @@
 2002-09-21  Darin Adler  <darin at apple.com>
 
+	Fix crashing part of 3057265 -- REGRESSION: Crash loading http://www.undetectables.co.uk/
+
+        * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+	Remove special case for javascript and about:blank that was leading to a crash.
+
+2002-09-21  Darin Adler  <darin at apple.com>
+
 	WebCore part of the new approach to AppKit drawing control.
 	Works better than the previous try. Once we fix anomalies with focus rectangles
 	and a minor problems with subframes this should work perfectly.
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index b0ba378..b90c518 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,12 @@
 2002-09-21  Darin Adler  <darin at apple.com>
 
+	Fix crashing part of 3057265 -- REGRESSION: Crash loading http://www.undetectables.co.uk/
+
+        * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+	Remove special case for javascript and about:blank that was leading to a crash.
+
+2002-09-21  Darin Adler  <darin at apple.com>
+
 	WebCore part of the new approach to AppKit drawing control.
 	Works better than the previous try. Once we fix anomalies with focus rectangles
 	and a minor problems with subframes this should work perfectly.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b0ba378..b90c518 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,12 @@
 2002-09-21  Darin Adler  <darin at apple.com>
 
+	Fix crashing part of 3057265 -- REGRESSION: Crash loading http://www.undetectables.co.uk/
+
+        * khtml/khtml_part.cpp: (KHTMLPart::processObjectRequest):
+	Remove special case for javascript and about:blank that was leading to a crash.
+
+2002-09-21  Darin Adler  <darin at apple.com>
+
 	WebCore part of the new approach to AppKit drawing control.
 	Works better than the previous try. Once we fix anomalies with focus rectangles
 	and a minor problems with subframes this should work perfectly.
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index a51936a..a9cfc5d 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2866,6 +2866,9 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
   if ( child->m_extension )
     child->m_extension->setURLArgs( child->m_args );
 
+#if APPLE_CHANGES
+  if ( !url.isEmpty() )
+#else
   if(url.protocol() == "javascript" || url.url() == "about:blank") {
       if (!child->m_part->inherits("KHTMLPart"))
           return false;
@@ -2884,6 +2887,7 @@ bool KHTMLPart::processObjectRequest( khtml::ChildFrame *child, const KURL &_url
       return true;
   }
   else if ( !url.isEmpty() )
+#endif
   {
       //kdDebug( 6050 ) << "opening " << url.url() << " in frame " << child->m_part << endl;
       return child->m_part->openURL( url );

-- 
WebKit Debian packaging