sjs/Marshmallows
1
0
Fork 0
mirror of https://github.com/samsonjs/Marshmallows.git synced 2026-04-27 15:07:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix a bug when setting a timeout in the HTTP client

Browse source
This commit is contained in:
Sami Samhuri 2011-12-19 17:09:09 -05:00
parent 148221bcf9
commit 637258880a
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Marshmallows/MMHTTPClient.m
View file

@ -220,15 +220,15 @@ NSString *JoinURLComponents(NSString *first, va_list args)
- (MMHTTPRequest *) request: (NSDictionary *)options then: (MMHTTPCallback)callback - (MMHTTPRequest *) request: (NSDictionary *)options then: (MMHTTPCallback)callback
{ {
NSString *url = [options objectForKey: @"url"]; NSString *url = [options objectForKey: @"url"];
NSMutableDictionary *mutableOptions = [options mutableCopy];
if (_baseURL && !([url hasPrefix: @"http:"] || [url hasPrefix: @"https:"])) { if (_baseURL && !([url hasPrefix: @"http:"] || [url hasPrefix: @"https:"])) {
NSMutableDictionary *mutableOptions = [options mutableCopy];
[mutableOptions setObject: [self urlWithPath: url] forKey: @"url"]; [mutableOptions setObject: [self urlWithPath: url] forKey: @"url"];
options = [NSDictionary dictionaryWithDictionary: mutableOptions];
} }
NSUInteger timeout = [[options objectForKey: @"timeout"] unsignedIntValue]; NSUInteger timeout = [[options objectForKey: @"timeout"] unsignedIntValue];
if (timeout == 0) { if (timeout == 0) {
[options setValue: [NSNumber numberWithUnsignedInt: self.timeout] forKey: @"timeout"]; [mutableOptions setValue: [NSNumber numberWithUnsignedInt: self.timeout] forKey: @"timeout"];
} }
options = [NSDictionary dictionaryWithDictionary: mutableOptions];
return [MMHTTPRequest requestWithOptions: options callback: callback]; return [MMHTTPRequest requestWithOptions: options callback: callback];
} }