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

[kocienda]

The following commit has been merged in the debian/unstable branch:
commit e6655db09dd7efed59a2e0275d3fbb0cd4dd7081
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Apr 16 22:08:48 2003 +0000

    WebFoundation:
    
            Reviewed by Darin
    
            Fixed synchronous loading API. When deciding on the new API,
    	we made a bonehead play which removed the ability to access
    	the error object associated with the load. Fixed.
    
            * CacheLoader.subproj/NSURLConnection.h:
            * CacheLoader.subproj/NSURLConnection.m:
            * CacheLoader.subproj/WebSynchronousDelegate.h:
            * CacheLoader.subproj/WebSynchronousDelegate.m:
            (-[WebSynchronousDelegate error]):
    
    WebKit:
    
            Reviewed by Darin
    
    	Fixed call to load synchronous URL. Now conforms to new API
    	which allows callers to access error object associated with
    	the load.
    
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _loadItem:withLoadType:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d97e87e..5771b89 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-04-16  Ken Kocienda  <kocienda at apple.com>
+
+        Reviewed by Darin
+
+	Fixed call to load synchronous URL. Now conforms to new API
+	which allows callers to access error object associated with 
+	the load.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _loadItem:withLoadType:]):
+
 2003-04-16  Chris Blumenberg  <cblu at apple.com>
 
 	- Progressively load plain text in our text view.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index a50e3db..a15c8cb 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1157,7 +1157,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
                 // extremely rare, but in that case the user will get an error on the navigation.
                 [request setCachePolicy:NSURLRequestReturnCacheDataDontLoad];
                 NSURLResponse *synchResponse = nil;
-                [NSURLConnection sendSynchronousRequest:request returningResponse:&synchResponse];
+                [NSURLConnection sendSynchronousRequest:request returningResponse:&synchResponse error:nil];
                 if (synchResponse == nil) { 
                     // Not in WF cache
                     [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];

-- 
WebKit Debian packaging