From 686854b8daf3ad3e5b87c6472422d0400ba54b99 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Fri, 16 Sep 2011 10:10:15 -0500 Subject: [PATCH] Fixing AFHTTPRequestOperation -responseString, to use string encoding from response, rather than assuming UTF8 --- AFNetworking/AFHTTPRequestOperation.m | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/AFNetworking/AFHTTPRequestOperation.m b/AFNetworking/AFHTTPRequestOperation.m index 1f6bf59..3b2775b 100644 --- a/AFNetworking/AFHTTPRequestOperation.m +++ b/AFNetworking/AFHTTPRequestOperation.m @@ -248,7 +248,13 @@ static NSThread *_networkRequestThread = nil; } - (NSString *)responseString { - return [[[NSString alloc] initWithData:self.responseBody encoding:NSUTF8StringEncoding] autorelease]; + if (!self.response || !self.responseBody) { + return nil; + } + + NSStringEncoding textEncoding = CFStringConvertEncodingToNSStringEncoding(CFStringConvertIANACharSetNameToEncoding((CFStringRef)self.response.textEncodingName)); + + return [[[NSString alloc] initWithData:self.responseBody encoding:textEncoding] autorelease]; } #pragma mark - NSOperation