Merge pull request #2868 from jcayzac/fix-2864

Fix #2864: allow empty x-www-form-urlencoded bodies
AFNetworking · Oct 8, 2015 · 824f7c5 · 824f7c5
2 parents 262ebd4 + 9cb72ef
commit 824f7c5
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 7 deletions.
diff --git a/AFNetworking/AFURLRequestSerialization.m b/AFNetworking/AFURLRequestSerialization.m
@@ -499,8 +499,8 @@ - (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
         }
     }];
 
+    NSString *query = nil;
     if (parameters) {
-        NSString *query = nil;
         if (self.queryStringSerialization) {
             NSError *serializationError;
             query = self.queryStringSerialization(request, parameters, &serializationError);
@@ -519,15 +519,21 @@ - (NSURLRequest *)requestBySerializingRequest:(NSURLRequest *)request
                     break;
             }
         }
+    }
 
-        if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
+    if ([self.HTTPMethodsEncodingParametersInURI containsObject:[[request HTTPMethod] uppercaseString]]) {
+        if (query) {
             mutableRequest.URL = [NSURL URLWithString:[[mutableRequest.URL absoluteString] stringByAppendingFormat:mutableRequest.URL.query ? @"&%@" : @"?%@", query]];
-        } else {
-            if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
-                [mutableRequest setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
-            }
-            [mutableRequest setHTTPBody:[query dataUsingEncoding:self.stringEncoding]];
         }
+    } else {
+        // #2864: an empty string is a valid x-www-form-urlencoded payload
+        if (!query) {
+            query = @"";
+        }
+        if (![mutableRequest valueForHTTPHeaderField:@"Content-Type"]) {
+            [mutableRequest setValue:@"application/x-www-form-urlencoded" forHTTPHeaderField:@"Content-Type"];
+        }
+        [mutableRequest setHTTPBody:[query dataUsingEncoding:self.stringEncoding]];
     }
 
     return mutableRequest;

diff --git a/Tests/Tests/AFHTTPRequestSerializationTests.m b/Tests/Tests/AFHTTPRequestSerializationTests.m
@@ -65,6 +65,34 @@ - (void)setUp {
 
 #pragma mark -
 
+- (void)testThatAFHTTPRequestSerializationSerializesPOSTRequestsProperly {
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://example.com"]];
+    request.HTTPMethod = @"POST";
+
+    NSURLRequest *serializedRequest = [self.requestSerializer requestBySerializingRequest:request withParameters:@{@"key":@"value"} error:nil];
+    NSString *contentType = serializedRequest.allHTTPHeaderFields[@"Content-Type"];
+
+    XCTAssertNotNil(contentType);
+    XCTAssertEqualObjects(contentType, @"application/x-www-form-urlencoded");
+
+    XCTAssertNotNil(serializedRequest.HTTPBody);
+    XCTAssertEqualObjects(serializedRequest.HTTPBody, [@"key=value" dataUsingEncoding:NSUTF8StringEncoding]);
+}
+
+- (void)testThatAFHTTPRequestSerializationSerializesPOSTRequestsProperlyWhenNoParameterIsProvided {
+    NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:[NSURL URLWithString:@"http://example.com"]];
+    request.HTTPMethod = @"POST";
+
+    NSURLRequest *serializedRequest = [self.requestSerializer requestBySerializingRequest:request withParameters:nil error:nil];
+    NSString *contentType = serializedRequest.allHTTPHeaderFields[@"Content-Type"];
+
+    XCTAssertNotNil(contentType);
+    XCTAssertEqualObjects(contentType, @"application/x-www-form-urlencoded");
+
+    XCTAssertNotNil(serializedRequest.HTTPBody);
+    XCTAssertEqualObjects(serializedRequest.HTTPBody, [NSData data]);
+}
+
 - (void)testThatAFHTTPRequestSerialiationSerializesQueryParametersCorrectly {
     NSURLRequest *originalRequest = [NSURLRequest requestWithURL:[NSURL URLWithString:@"http://example.com"]];
     NSURLRequest *serializedRequest = [self.requestSerializer requestBySerializingRequest:originalRequest withParameters:@{@"key":@"value"} error:nil];