evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

replace custom base-URL method with standard NSURL one

Browse source
This commit is contained in:
Scott Raymond 2011-11-01 15:42:33 -05:00
parent f86ac982db
commit e2f5f86146
1 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
AFNetworking/AFHTTPClient.m
View file

@ -81,16 +81,6 @@ static NSString * AFBase64EncodedStringFromString(NSString *string) {
return [[[NSString alloc] initWithData:mutableData encoding:NSASCIIStringEncoding] autorelease]; return [[[NSString alloc] initWithData:mutableData encoding:NSASCIIStringEncoding] autorelease];
} }
static NSURL * AFURLWithPathRelativeToURL(NSString *path, NSURL *baseURL) {
NSURL *url = [baseURL URLByAppendingPathComponent:[path stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"/"]]];
NSString *URLString = [url absoluteString];
if ([path hasSuffix:@"/"]) {
URLString = [URLString stringByAppendingString:@"/"];
}
return [NSURL URLWithString:URLString];
}
static NSString * AFURLEncodedStringFromString(NSString *string) { static NSString * AFURLEncodedStringFromString(NSString *string) {
static NSString * const kAFLegalCharactersToBeEscaped = @"?!@#$^&%*+,:;='\"`<>()[]{}/\\|~ "; static NSString * const kAFLegalCharactersToBeEscaped = @"?!@#$^&%*+,:;='\"`<>()[]{}/\\|~ ";
@ -249,7 +239,8 @@ static NSString * AFPropertyListStringFromParameters(NSDictionary *parameters) {
path:(NSString *)path path:(NSString *)path
parameters:(NSDictionary *)parameters parameters:(NSDictionary *)parameters
{ {
NSURL *url = AFURLWithPathRelativeToURL(path, self.baseURL); NSURL *url = [NSURL URLWithString:path relativeToURL:self.baseURL];
NSMutableURLRequest *request = [[[NSMutableURLRequest alloc] initWithURL:url] autorelease]; NSMutableURLRequest *request = [[[NSMutableURLRequest alloc] initWithURL:url] autorelease];
[request setHTTPMethod:method]; [request setHTTPMethod:method];
[request setAllHTTPHeaderFields:self.defaultHeaders]; [request setAllHTTPHeaderFields:self.defaultHeaders];