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

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 43c605e0be80f318c1261b1ef32ebfd6affbc31f
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat May 10 07:56:20 2003 +0000

    Tests:
    
            Reviewed by Darin.
    
    	Updated for API changes.
    
            * PictureBrowser/PictureBrowserProtocol.m:
            (-[PictureBrowserProtocol startLoading]):
    
    WebFoundation:
    
    	API CHANGE
    
            Reviewed by Darin.
    
    	- removed secred NSURLResponse mutators from NSURLProtocol.
    	- added four-argument init method for NSURLResponse.
    	- added NSURLResponseUnknownLength constant.
    	- fixed a tiny bug in the HTTP protocol where unknown content
    	length would sometimes get reported as 0.
    
            * CacheLoader.subproj/NSURLConnection.m:
            (-[NSURLConnection _didFailWithError:]):
            * CacheLoader.subproj/NSURLProtocol.h:
            * CacheLoader.subproj/NSURLProtocol.m:
            * CacheLoader.subproj/NSURLResponse.h:
            * CacheLoader.subproj/NSURLResponse.m:
            (-[NSURLResponseInternal initWithURL:MIMEType:expectedContentLength:textEncodingName:]):
            (-[NSURLResponse initWithURL:MIMEType:expectedContentLength:textEncodingName:]):
            (-[NSURLResponse init]):
            (-[NSURLResponse initWithCoder:]):
            (-[NSURLResponse _setExpectedContentLength:]):
            (-[NSURLResponse _setMIMEType:]):
            * CacheLoader.subproj/NSURLResponsePrivate.h:
            * ChangeLog:
            * ProtocolHandlers.subproj/NSAboutURLProtocol.m:
            (-[NSAboutURLProtocol startLoading]):
            * ProtocolHandlers.subproj/NSFTPURLProtocol.m:
            (-[NSFTPURLProtocol sendResponseAvailableCallback]):
            * ProtocolHandlers.subproj/NSFileURLProtocol.m:
            (-[NSFileURLProtocol didLoadData:]):
            * ProtocolHandlers.subproj/NSHTTPURLProtocol.m:
            (-[NSHTTPURLProtocol HTTPResponse]):
    
    WebKit:
    
            Reviewed by Darin.
    
    	Updated for NSURLResponse API changes.
    
            * WebView.subproj/WebBaseResourceHandleDelegate.m:
            (-[WebBaseResourceHandleDelegate connection:didReceiveResponse:]):
            * WebView.subproj/WebDataProtocol.m:
            (-[WebDataProtocol startLoading]):
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient loadWithRequest:]):
    
    WebBrowser:
    
            Reviewed by Darin.
    
    	Updated for NSURLResponse API changes.
    
            * BookmarksProtocol.m:
            (-[BookmarksProtocol startLoading]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4342 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index d62a868..568e119 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -2,6 +2,19 @@
 
         Reviewed by Darin.
 
+	Updated for NSURLResponse API changes.
+
+        * WebView.subproj/WebBaseResourceHandleDelegate.m:
+        (-[WebBaseResourceHandleDelegate connection:didReceiveResponse:]):
+        * WebView.subproj/WebDataProtocol.m:
+        (-[WebDataProtocol startLoading]):
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient loadWithRequest:]):
+
+2003-05-09  Maciej Stachowiak  <mjs at apple.com>
+
+        Reviewed by Darin.
+
 	- removed WebAuthenticationChallenge
 	- adjusted everything for removal of NSURLAuthenticationChallenge subclasses.
 	
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 214efb4..1fd6ce1 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -269,11 +269,11 @@
     // If the URL is one of our whacky applewebdata URLs that
     // fake up a substitute URL to present to the delegate.
     if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
-        NSURL *baseURL = [request _webDataRequestBaseURL];
-        if (baseURL)
-            [r _setURL: baseURL];
-        else
-            [r _setURL: [NSURL URLWithString: @"about:blank"]];
+	NSURL *baseURL = [request _webDataRequestBaseURL];
+        if (baseURL == nil) {
+            baseURL = @"about:blank";
+	}
+        r = [[[NSURLResponse alloc] initWithURL:baseURL MIMEType:[r MIMEType] expectedContentLength:[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
     }
 
     [r retain];
diff --git a/WebKit/WebView.subproj/WebDataProtocol.m b/WebKit/WebView.subproj/WebDataProtocol.m
index a8a9249..926afd9 100644
--- a/WebKit/WebView.subproj/WebDataProtocol.m
+++ b/WebKit/WebView.subproj/WebDataProtocol.m
@@ -187,10 +187,7 @@ static NSString *WebDataRequestPropertyKey = @"WebDataRequest";
     NSData *data = [request _webDataRequestData];
 
     if (data) {
-        NSURLResponse *response = [[NSURLResponse alloc] init];
-        [response _setURL:[request URL]];
-        [response _setMIMEType:[request _webDataRequestMIMEType]];
-        [response _setTextEncodingName:[request _webDataRequestEncoding]];
+        NSURLResponse *response = [[NSURLResponse alloc] initWithURL:[request URL] MIMEType:[request _webDataRequestMIMEType] expectedContentLength:[data length] textEncodingName:[request _webDataRequestEncoding]];
         [client URLProtocol:self didReceiveResponse:response cacheStoragePolicy:NSURLCacheStorageNotAllowed];
         [client URLProtocol:self didLoadData:data];
         [client URLProtocolDidFinishLoading:self];
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 214efb4..1fd6ce1 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -269,11 +269,11 @@
     // If the URL is one of our whacky applewebdata URLs that
     // fake up a substitute URL to present to the delegate.
     if([WebDataProtocol _webIsDataProtocolURL:[r URL]]) {
-        NSURL *baseURL = [request _webDataRequestBaseURL];
-        if (baseURL)
-            [r _setURL: baseURL];
-        else
-            [r _setURL: [NSURL URLWithString: @"about:blank"]];
+	NSURL *baseURL = [request _webDataRequestBaseURL];
+        if (baseURL == nil) {
+            baseURL = @"about:blank";
+	}
+        r = [[[NSURLResponse alloc] initWithURL:baseURL MIMEType:[r MIMEType] expectedContentLength:[r expectedContentLength] textEncodingName:[r textEncodingName]] autorelease];
     }
 
     [r retain];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 8210f18..81d7a05 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -305,10 +305,10 @@
 
 	[self connection:connection willSendRequest:r redirectResponse:nil];
 
-	NSURLResponse *rsp = [[NSURLResponse alloc] init];
-	[rsp _setURL:[[[self dataSource] request] URL]];
-	[rsp _setMIMEType:@"text/html"];
-	[rsp _setExpectedContentLength:0];
+	NSURLResponse *rsp = [[NSURLResponse alloc] initWithURL:[[[self dataSource] request] URL]
+						    MIMEType:@"text/html"
+						    expectedContentLength:0
+						    textEncodingName:nil];
 	[self connection:connection didReceiveResponse:rsp];
 	[rsp release];
     } else {
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 8210f18..81d7a05 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -305,10 +305,10 @@
 
 	[self connection:connection willSendRequest:r redirectResponse:nil];
 
-	NSURLResponse *rsp = [[NSURLResponse alloc] init];
-	[rsp _setURL:[[[self dataSource] request] URL]];
-	[rsp _setMIMEType:@"text/html"];
-	[rsp _setExpectedContentLength:0];
+	NSURLResponse *rsp = [[NSURLResponse alloc] initWithURL:[[[self dataSource] request] URL]
+						    MIMEType:@"text/html"
+						    expectedContentLength:0
+						    textEncodingName:nil];
 	[self connection:connection didReceiveResponse:rsp];
 	[rsp release];
     } else {

-- 
WebKit Debian packaging