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

Set text encoding for -responseString to UTF-8 by default, in case an encoding is not set in the response

Browse source
This commit is contained in:
Mattt Thompson 2011-10-13 12:57:39 -05:00
parent 8da80668f4
commit 4a93904566
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
AFNetworking/AFURLConnectionOperation.h
View file

@ -128,7 +128,7 @@ extern NSString * const AFNetworkingOperationDidFinishNotification;
/** /**
The string representation of the response data. The string representation of the response data.
@discussion This method uses the string encoding of the response to construct a string from the response data. @discussion This method uses the string encoding of the response, or if UTF-8 if not specified, to construct a string from the response data.
*/ */
@property (readonly, nonatomic, copy) NSString *responseString; @property (readonly, nonatomic, copy) NSString *responseString;

6
AFNetworking/AFURLConnectionOperation.m
View file

@ -233,7 +233,11 @@ static inline NSString * AFKeyPathFromOperationState(AFOperationState state) {
- (NSString *)responseString { - (NSString *)responseString {
if (!_responseString && self.response && self.responseData) { if (!_responseString && self.response && self.responseData) {
NSStringEncoding textEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)self.response.textEncodingName)); NSStringEncoding textEncoding = NSUTF8StringEncoding;
if (self.response.textEncodingName) {
textEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)self.response.textEncodingName));
}
self.responseString = [[[NSString alloc] initWithData:self.responseData encoding:textEncoding] autorelease]; self.responseString = [[[NSString alloc] initWithData:self.responseData encoding:textEncoding] autorelease];
} }