mirror of
https://github.com/gnustep/libs-base.git
synced 2025-05-31 16:50:58 +00:00
Sync up to get retries working
git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@21161 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
parent
66c299cacf
commit
2a5a2dca5a
3 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2005-04-26 Richard Frith-Macdonald <rfm@gnu.org>
|
||||||
|
|
||||||
|
* Source/GSHTTPURLHandle.m: remove wProperties and wData from
|
||||||
|
handle in sync.
|
||||||
|
|
||||||
2005-04-25 Richard Frith-Macdonald <rfm@gnu.org>
|
2005-04-25 Richard Frith-Macdonald <rfm@gnu.org>
|
||||||
|
|
||||||
* Tools/defaults.m: Fix bug writing defaults whose values should be
|
* Tools/defaults.m: Fix bug writing defaults whose values should be
|
||||||
|
|
|
@ -375,7 +375,6 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
|
||||||
{
|
{
|
||||||
[s appendFormat: @"%@: %@\r\n", key, [wProperties objectForKey: key]];
|
[s appendFormat: @"%@: %@\r\n", key, [wProperties objectForKey: key]];
|
||||||
}
|
}
|
||||||
[wProperties removeAllObjects];
|
|
||||||
[s appendString: @"\r\n"];
|
[s appendString: @"\r\n"];
|
||||||
buf = [[s dataUsingEncoding: NSASCIIStringEncoding] mutableCopy];
|
buf = [[s dataUsingEncoding: NSASCIIStringEncoding] mutableCopy];
|
||||||
|
|
||||||
|
@ -505,6 +504,7 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
|
||||||
r = NSMakeRange(bodyPos, [d length] - bodyPos);
|
r = NSMakeRange(bodyPos, [d length] - bodyPos);
|
||||||
bodyPos = 0;
|
bodyPos = 0;
|
||||||
DESTROY(wData);
|
DESTROY(wData);
|
||||||
|
[wProperties removeAllObjects];
|
||||||
[self didLoadBytes: [d subdataWithRange: r]
|
[self didLoadBytes: [d subdataWithRange: r]
|
||||||
loadComplete: YES];
|
loadComplete: YES];
|
||||||
}
|
}
|
||||||
|
@ -578,6 +578,7 @@ static void debugWrite(GSHTTPURLHandle *handle, NSData *data)
|
||||||
- (void) endLoadInBackground
|
- (void) endLoadInBackground
|
||||||
{
|
{
|
||||||
DESTROY(wData);
|
DESTROY(wData);
|
||||||
|
[wProperties removeAllObjects];
|
||||||
if (connectionState != idle)
|
if (connectionState != idle)
|
||||||
{
|
{
|
||||||
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
|
NSNotificationCenter *nc = [NSNotificationCenter defaultCenter];
|
||||||
|
|
|
@ -540,7 +540,7 @@ static BOOL setSharedDefaults = NO; /* Flag to prevent infinite recursion */
|
||||||
if (added_lang == NO)
|
if (added_lang == NO)
|
||||||
{
|
{
|
||||||
/* Ack! We should never get here */
|
/* Ack! We should never get here */
|
||||||
NSLog(@"Improper installation: No language locale found");
|
NSWarnMLog(@"Improper installation: No language locale found");
|
||||||
[sharedDefaults registerDefaults: [self _unlocalizedDefaults]];
|
[sharedDefaults registerDefaults: [self _unlocalizedDefaults]];
|
||||||
}
|
}
|
||||||
RETAIN(sharedDefaults);
|
RETAIN(sharedDefaults);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue