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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit f6bf340ef860a6cdc9dc9db0c6cd0b0d2ea9917a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jun 14 22:39:32 2003 +0000

    	Fixed: <rdar://problem/3293367>: REGRESSION (83-84): nil-deref in addMetaData loading page in pop-up at live365.com
    
            Reviewed by darin.
    
            * kwq/WebCoreBridge.mm:
            (-[WebCoreBridge openURL:reload:contentType:refresh:lastModified:pageCache:]): only call addMetaData if didOpenURL
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4551 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 09fa43e..17a47fb 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,12 @@
+2003-06-14  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3293367>: REGRESSION (83-84): nil-deref in addMetaData loading page in pop-up at live365.com
+
+        Reviewed by darin.
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge openURL:reload:contentType:refresh:lastModified:pageCache:]): only call addMetaData if didOpenURL
+
 2003-06-13  Darin Adler  <darin at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 09fa43e..17a47fb 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2003-06-14  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3293367>: REGRESSION (83-84): nil-deref in addMetaData loading page in pop-up at live365.com
+
+        Reviewed by darin.
+
+        * kwq/WebCoreBridge.mm:
+        (-[WebCoreBridge openURL:reload:contentType:refresh:lastModified:pageCache:]): only call addMetaData if didOpenURL
+
 2003-06-13  Darin Adler  <darin at apple.com>
 
         Reviewed by Don.
diff --git a/WebCore/kwq/WebCoreBridge.mm b/WebCore/kwq/WebCoreBridge.mm
index d56ca79..45577ee 100644
--- a/WebCore/kwq/WebCoreBridge.mm
+++ b/WebCore/kwq/WebCoreBridge.mm
@@ -176,15 +176,15 @@ static bool initializedObjectCacheSize = FALSE;
     _part->browserExtension()->setURLArgs(args);
 
     // opening the URL
-    _part->didOpenURL([URL cString]);
-
-    // things we have to set up after calling didOpenURL
-    if (refresh) {
-        _part->addMetaData("http-refresh", QString::fromNSString(refresh));
-    }
-    if (lastModified) {
-	NSString *modifiedString = [lastModified descriptionWithCalendarFormat:@"%a %b %d %Y %H:%M:%S" timeZone:nil locale:nil];
-	_part->addMetaData("modified", QString::fromNSString(modifiedString));
+    if (_part->didOpenURL([URL cString])) {
+        // things we have to set up after calling didOpenURL
+        if (refresh) {
+            _part->addMetaData("http-refresh", QString::fromNSString(refresh));
+        }
+        if (lastModified) {
+            NSString *modifiedString = [lastModified descriptionWithCalendarFormat:@"%a %b %d %Y %H:%M:%S" timeZone:nil locale:nil];
+            _part->addMetaData("modified", QString::fromNSString(modifiedString));
+        }
     }
 }
 

-- 
WebKit Debian packaging