[Issue #1388] Fixing regression in nested multipart parameters

This commit is contained in:
Mattt Thompson 2013-10-11 04:54:33 +02:00
parent 5bcac2f7e4
commit 5b8131ee7c

View File

@ -285,20 +285,20 @@ NSArray * AFQueryStringPairsFromKeyAndValue(NSString *key, id value) {
__block AFStreamingMultipartFormData *formData = [[AFStreamingMultipartFormData alloc] initWithURLRequest:request stringEncoding:NSUTF8StringEncoding];
if (parameters) {
[parameters enumerateKeysAndObjectsUsingBlock:^(id key, id obj, BOOL * __unused stop) {
for (AFQueryStringPair *pair in AFQueryStringPairsFromDictionary(parameters)) {
NSData *data = nil;
if ([obj isKindOfClass:[NSData class]]) {
data = obj;
} else if ([obj isEqual:[NSNull null]]) {
if ([pair.value isKindOfClass:[NSData class]]) {
data = pair.value;
} else if ([pair.value isEqual:[NSNull null]]) {
data = [NSData data];
} else {
data = [[obj description] dataUsingEncoding:NSUTF8StringEncoding];
data = [[pair.value description] dataUsingEncoding:self.stringEncoding];
}
if (data) {
[formData appendPartWithFormData:data name:[key description]];
[formData appendPartWithFormData:data name:[pair.field description]];
}
}];
}
}
if (block) {