Merge pull request #15 from vishalduggal/timob-6828

[TIMOB-6828] Setting value as nil removes header from request
tidev · Jul 1, 2014 · 20fb741 · 20fb741
2 parents 7bc070b + ea3b04f
commit 20fb741
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 2 deletions.
diff --git a/APSHTTPClient/APSHTTPPostForm.m b/APSHTTPClient/APSHTTPPostForm.m
@@ -249,7 +249,17 @@ -(void)addFormData:(NSData*)data fileName:(NSString*)fileName fieldName:(NSStrin
 
 -(void)addHeaderKey:(NSString*)key andHeaderValue:(NSString*)value
 {
-	[[self headers] setValue:value forKey:key];
+    if (key == nil) {
+        DebugLog(@"Ignore request to %s. key is nil.", __PRETTY_FUNCTION__);
+        return;
+    }
+
+    if (value == nil) {
+        DebugLog(@"Remove header for key %@.", key);
+        [self.headers removeObjectForKey:key];
+    } else {
+        self.headers[key] = value;
+    }
 }
 
 @end
diff --git a/APSHTTPClient/APSHTTPRequest.m b/APSHTTPClient/APSHTTPRequest.m
@@ -165,7 +165,16 @@ otherwise just configure to run in NSDefaultRunLoopMode (Default).
 
 -(void)addRequestHeader:(NSString *)key value:(NSString *)value
 {
-    self.headers[key] = value;
+    if (key == nil) {
+        DebugLog(@"Ignore request to %s. key is nil.", __PRETTY_FUNCTION__);
+        return;
+    }
+    if (value == nil) {
+        DebugLog(@"Remove header for key %@.", key);
+        [self.headers removeObjectForKey:key];
+    } else {
+        self.headers[key] = value;
+    }
 }
 
 -(BOOL)connectionShouldUseCredentialStorage:(NSURLConnection *)connection