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

Merge branch 'bracket-pull-request' of github.com:opentable/AFNetworking into opentable-bracket-pull-request

Browse source 
Conflicts:
	AFNetworking/AFHTTPClient.m
This commit is contained in:
Mattt Thompson 2013-09-24 12:36:34 -07:00
commit 52ad3f8380
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
AFNetworking/AFHTTPClient.m
View file

@ -80,11 +80,16 @@ static NSString * AFBase64EncodedStringFromString(NSString *string) {
return [[NSString alloc] initWithData:mutableData encoding:NSASCIIStringEncoding]; return [[NSString alloc] initWithData:mutableData encoding:NSASCIIStringEncoding];
} }
static NSString * AFPercentEscapedQueryStringPairMemberFromStringWithEncoding(NSString *string, NSStringEncoding encoding) { static NSString * const kAFCharactersToBeEscapedInQueryString = @":/?&=;+!@#$()',*";
static NSString * const kAFCharactersToBeEscaped = @":/?&=;+!@#$()',*";
static NSString * const kAFCharactersToLeaveUnescaped = @"[].";
return (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, (__bridge CFStringRef)kAFCharactersToLeaveUnescaped, (__bridge CFStringRef)kAFCharactersToBeEscaped, CFStringConvertNSStringEncodingToEncoding(encoding)); static NSString * AFPercentEscapedQueryStringPairKeyFromStringWithEncoding(NSString *string, NSStringEncoding encoding) {
static NSString * const kAFCharactersToLeaveUnescapedInQueryStringPairKey = @"[].";
return (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, (__bridge CFStringRef)kAFCharactersToLeaveUnescapedInQueryStringPairKey, (__bridge CFStringRef)kAFCharactersToBeEscapedInQueryString, CFStringConvertNSStringEncodingToEncoding(encoding));
}
static NSString * AFPercentEscapedQueryStringPairValueFromStringWithEncoding(NSString *string, NSStringEncoding encoding) {
return (__bridge_transfer NSString *)CFURLCreateStringByAddingPercentEscapes(kCFAllocatorDefault, (__bridge CFStringRef)string, NULL, (__bridge CFStringRef)kAFCharactersToBeEscapedInQueryString, CFStringConvertNSStringEncodingToEncoding(encoding));
} }
#pragma mark - #pragma mark -
@ -116,9 +121,9 @@ static NSString * AFPercentEscapedQueryStringPairMemberFromStringWithEncoding(NS
- (NSString *)URLEncodedStringValueWithEncoding:(NSStringEncoding)stringEncoding { - (NSString *)URLEncodedStringValueWithEncoding:(NSStringEncoding)stringEncoding {
if (!self.value || [self.value isEqual:[NSNull null]]) { if (!self.value || [self.value isEqual:[NSNull null]]) {
return AFPercentEscapedQueryStringPairMemberFromStringWithEncoding([self.field description], stringEncoding); return AFPercentEscapedQueryStringPairValueFromStringWithEncoding([self.field description], stringEncoding);
} else { } else {
return [NSString stringWithFormat:@"%@=%@", AFPercentEscapedQueryStringPairMemberFromStringWithEncoding([self.field description], stringEncoding), AFPercentEscapedQueryStringPairMemberFromStringWithEncoding([self.value description], stringEncoding)]; return [NSString stringWithFormat:@"%@=%@", AFPercentEscapedQueryStringPairValueFromStringWithEncoding([self.field description], stringEncoding), AFPercentEscapedQueryStringPairKeyFromStringWithEncoding([self.value description], stringEncoding)];
} }
} }