[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 edfc838b5209f8fd559095ad6e583c4dab8eab29
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 1 23:46:04 2003 +0000

            Reviewed by John.
    
            - fixed 3466714 -- page with <object> tag with text subtype and no URL causes hang
    
            * khtml/khtml_part.cpp: (KHTMLPart::requestObject): Added a check so that an empty
            URL string doesn't get completed, and results in an empty KURL object. Also made the
            change to allow empty URLs unconditional, because I don't think it's a WebCore-specific
            thing on further reflection.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5352 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index b0c7bbf..d9580fd 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,14 @@
+2003-11-01  Darin Adler  <darin at apple.com>
+
+        Reviewed by John.
+
+        - fixed 3466714 -- page with <object> tag with text subtype and no URL causes hang
+
+        * khtml/khtml_part.cpp: (KHTMLPart::requestObject): Added a check so that an empty
+        URL string doesn't get completed, and results in an empty KURL object. Also made the
+        change to allow empty URLs unconditional, because I don't think it's a WebCore-specific
+        thing on further reflection.
+
 2003-10-31  David Hyatt  <hyatt at apple.com>
 
 	Fix for 3470489, I just forgot to commit a piece of my patch.  This has actually even
diff --git a/WebCore/khtml/khtml_part.cpp b/WebCore/khtml/khtml_part.cpp
index dca83f9..b15931c 100644
--- a/WebCore/khtml/khtml_part.cpp
+++ b/WebCore/khtml/khtml_part.cpp
@@ -2995,19 +2995,19 @@ QString KHTMLPart::requestFrameName()
 bool KHTMLPart::requestObject( khtml::RenderPart *frame, const QString &url, const QString &serviceType,
                                const QStringList &params )
 {
-#if !APPLE_CHANGES
-  if (url.isEmpty())
-    return false;
-#endif
   khtml::ChildFrame child;
   QValueList<khtml::ChildFrame>::Iterator it = d->m_objects.append( child );
   (*it).m_frame = frame;
   (*it).m_type = khtml::ChildFrame::Object;
   (*it).m_params = params;
 
+  KURL completedURL;
+  if (!url.isEmpty())
+    completedURL = completeURL(url);
+
   KParts::URLArgs args;
   args.serviceType = serviceType;
-  return requestObject( &(*it), completeURL( url ), args );
+  return requestObject( &(*it), completedURL, args );
 }
 
 bool KHTMLPart::requestObject( khtml::ChildFrame *child, const KURL &url, const KParts::URLArgs &_args )

-- 
WebKit Debian packaging