github/GCDWebServer
3
0
Fork 0
mirror of https://github.com/swisspol/GCDWebServer.git synced 2026-05-31 00:00:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #55 from mstarinteractive/fix-json-content-type

Browse Source 
Fix content-types like "application/json; charset=utf-8"
This commit is contained in:
Pierre-Olivier Latour
2014-05-16 12:17:19 -07:00
parent d1c7f9a323 a7f46b762f
commit 6d550a02b7
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GCDWebServer/Requests/GCDWebServerDataRequest.m
+2 -1
View File
@@ -97,7 +97,8 @@
- (id)jsonObject { - (id)jsonObject {
if (_jsonObject == nil) { if (_jsonObject == nil) {
if ([self.contentType isEqualToString:@"application/json"] || [self.contentType isEqualToString:@"text/json"] || [self.contentType isEqualToString:@"text/javascript"]) { NSString* mimeType = GCDWebServerTruncateHeaderValue(self.contentType);
if ([mimeType isEqualToString:@"application/json"] || [mimeType isEqualToString:@"text/json"] || [mimeType isEqualToString:@"text/javascript"]) {
_jsonObject = ARC_RETAIN([NSJSONSerialization JSONObjectWithData:_data options:0 error:NULL]); _jsonObject = ARC_RETAIN([NSJSONSerialization JSONObjectWithData:_data options:0 error:NULL]);
} else { } else {
DNOT_REACHED(); DNOT_REACHED();