gnustep/libs-base
0
0
Fork 0
mirror of https://github.com/gnustep/libs-base.git synced 2025-04-22 16:33:29 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix for buf #38043

Browse source 
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@36008 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
Richard Frith-MacDonald 2013-01-21 10:38:15 +00:00
parent 82c51f73a4
commit 5702ee1e43
2 changed files with 37 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -5,6 +5,9 @@
* Source/NSPropertyList.m: Fix encoding of date objects when using the
OpenStep format to simply used the description of the3 date.
Fixes bug #38017
* Source/NSURLConnection.m: a synchronous download with no response
body should return an empty data item rather than nil ... fix for
bug #38043
2013-01-14 Richard Frith-Macdonald <rfm@gnu.org>

61
Source/NSURLConnection.m
View file

@ -66,6 +66,15 @@
return _data;
}
- (id) init
{
if (nil != (self = [super init]))
{
_data = [NSMutableData new]; // Empty data unless we get an error
}
return self;
}
- (NSError*) error
{
return _error;
@ -85,6 +94,7 @@
didFailWithError: (NSError *)error
{
ASSIGN(_error, error);
DESTROY(_data); // On error, we make the data nil
_done = YES;
}
@ -103,14 +113,7 @@
- (void) connection: (NSURLConnection *)connection
didReceiveData: (NSData *)data
{
if (nil == _data)
{
_data = [data mutableCopy];
}
else
{
[_data appendData: data];
}
[_data appendData: data];
}
@end
@ -313,31 +316,35 @@ typedef struct
{
_NSURLConnectionDataCollector *collector;
NSURLConnection *conn;
NSRunLoop *loop;
collector = [_NSURLConnectionDataCollector new];
conn = [[self alloc] initWithRequest: request delegate: collector];
[collector release]; // retained by connection
[collector setConnection: conn];
loop = [NSRunLoop currentRunLoop];
while ([collector done] == NO)
if (nil != conn)
{
NSDate *limit;
NSRunLoop *loop;
limit = [[NSDate alloc] initWithTimeIntervalSinceNow: 1.0];
[loop runMode: NSDefaultRunLoopMode beforeDate: limit];
RELEASE(limit);
}
data = [[[collector data] retain] autorelease];
if (0 != response)
{
*response = [[[collector response] retain] autorelease];
}
if (0 != error)
{
*error = [[[collector error] retain] autorelease];
}
[conn release];
[collector setConnection: conn];
loop = [NSRunLoop currentRunLoop];
while ([collector done] == NO)
{
NSDate *limit;
limit = [[NSDate alloc] initWithTimeIntervalSinceNow: 1.0];
[loop runMode: NSDefaultRunLoopMode beforeDate: limit];
RELEASE(limit);
}
data = [[[collector data] retain] autorelease];
if (0 != response)
{
*response = [[[collector response] retain] autorelease];
}
if (0 != error)
{
*error = [[[collector error] retain] autorelease];
}
[conn release];
}
}
return data;
}