gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-05-20 20:26:42 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix to reture respnse for synchronous request.

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@33949 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2011-10-07 09:17:14 +00:00
parent aae4782eb3
commit f7280475ff
4 changed files with 88 additions and 96 deletions
Download patch file Download diff file Expand all files Collapse all files

30
Source/NSURLProtocol.m
View file

@ -679,10 +679,15 @@ static NSURLProtocol *placeholder = nil;
wasRedirectedToRequest: request
redirectResponse: nil];
}
if (_isLoading == NO)
if (NO == _isLoading)
{
return;
return; // Loading cancelled
}
if (nil != this->input)
{
return; // Following redirection
}
// Fall through to continue original connect.
}
if (0 && this->cachedResponse)
@ -843,6 +848,8 @@ static NSURLProtocol *placeholder = nil;
GSMimeHeader *info;
NSString *enc;
int len = -1;
NSString *ct;
NSString *st;
NSString *s;
info = [document headerNamed: @"http"];
@ -878,11 +885,22 @@ static NSURLProtocol *placeholder = nil;
enc = [[document headerNamed: @"transfer-encoding"] value];
}
info = [document headerNamed: @"content-type"];
ct = [document contentType];
st = [document contentSubtype];
if (ct && st)
{
ct = [ct stringByAppendingFormat: @"/%@", st];
}
else
{
ct = nil;
}
_response = [[NSHTTPURLResponse alloc]
initWithURL: [this->request URL]
MIMEType: nil
MIMEType: ct
expectedContentLength: len
textEncodingName: nil];
textEncodingName: [info parameterForKey: @"charset"]];
[_response _setStatusCode: _statusCode text: s];
[document deleteHeaderNamed: @"http"];
[_response _setHeaders: [document allHeaders]];
@ -1237,7 +1255,8 @@ static NSURLProtocol *placeholder = nil;
IF_NO_GC([[self retain] autorelease];)
#if 0
NSLog(@"stream: %@ handleEvent: %x for: %@", stream, event, self);
NSLog(@"stream: %@ handleEvent: %x for: %@ (ip %p, op %p)",
stream, event, self, this->input, this->output);
#endif
if (stream == this->input)
@ -1479,6 +1498,7 @@ static NSURLProtocol *placeholder = nil;
}
if (_shouldClose == YES)
{
[this->output setDelegate: nil];
[this->output removeFromRunLoop:
[NSRunLoop currentRunLoop]
forMode: NSDefaultRunLoopMode];