Allow POST for form data requests

@@ -71,7 +71,6 @@
 		[self setPostData:[NSMutableDictionary dictionary]];
 		[self setPostData:[NSMutableDictionary dictionary]];
 	}
 	}
 	[[self postData] setValue:[value description] forKey:key];
 	[[self postData] setValue:[value description] forKey:key];
-	[self setRequestMethod:@"POST"];
 }
 }
 
 
 - (void)setFile:(NSString *)filePath forKey:(NSString *)key
 - (void)setFile:(NSString *)filePath forKey:(NSString *)key
@@ -107,7 +106,6 @@
 	
 	
 	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", nil];
 	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", nil];
 	[[self fileData] setObject:fileInfo forKey:key];
 	[[self fileData] setObject:fileInfo forKey:key];
-	[self setRequestMethod: @"POST"];
 }
 }
 
 
 - (void)setData:(NSData *)data forKey:(NSString *)key
 - (void)setData:(NSData *)data forKey:(NSString *)key
@@ -126,7 +124,6 @@
 	
 	
 	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", nil];
 	NSDictionary *fileInfo = [NSDictionary dictionaryWithObjectsAndKeys:data, @"data", contentType, @"contentType", fileName, @"fileName", nil];
 	[[self fileData] setObject:fileInfo forKey:key];
 	[[self fileData] setObject:fileInfo forKey:key];
-	[self setRequestMethod: @"POST"];
 }
 }
 
 
 - (void)buildPostBody
 - (void)buildPostBody
@@ -134,6 +131,9 @@
 	if ([self haveBuiltPostBody]) {
 	if ([self haveBuiltPostBody]) {
 		return;
 		return;
 	}
 	}
+	if (![[self requestMethod] isEqualToString:@"PUT"]) {
+		[self setRequestMethod:@"POST"];
+	}
 	
 	
 #if DEBUG_FORM_DATA_REQUEST
 #if DEBUG_FORM_DATA_REQUEST
 	[self setDebugBodyString:@""];	
 	[self setDebugBodyString:@""];	
@@ -299,6 +299,7 @@
 	[newRequest setFileData:[[[self fileData] copyWithZone:zone] autorelease]];
 	[newRequest setFileData:[[[self fileData] copyWithZone:zone] autorelease]];
 	[newRequest setPostFormat:[self postFormat]];
 	[newRequest setPostFormat:[self postFormat]];
 	[newRequest setStringEncoding:[self stringEncoding]];
 	[newRequest setStringEncoding:[self stringEncoding]];
+	[newRequest setRequestMethod:[self requestMethod]];
 	return newRequest;
 	return newRequest;
 }
 }
 
 

@@ -21,7 +21,7 @@
 #import "ASIInputStream.h"
 #import "ASIInputStream.h"
 
 
 // Automatically set on build
 // Automatically set on build
-NSString *ASIHTTPRequestVersion = @"v1.5-43 2010-02-04";
+NSString *ASIHTTPRequestVersion = @"v1.5-44 2010-02-04";
 
 
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 NSString* const NetworkRequestErrorDomain = @"ASIHTTPRequestErrorDomain";
 
 

@@ -17,4 +17,6 @@
 - (void)testSubclass;
 - (void)testSubclass;
 - (void)testURLEncodedPost;
 - (void)testURLEncodedPost;
 - (void)testCharset;
 - (void)testCharset;
+- (void)testPUT;
+- (void)testCopy;
 @end
 @end

@@ -180,6 +180,27 @@
 
 
 }
 }
 
 
+- (void)testPUT
+{
+	ASIFormDataRequest *request = [ASIFormDataRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/Tests/put_form_data"]];
+	[request setRequestMethod:@"PUT"];
+	[request setPostValue:@"cheep cheep" forKey:@"hello"];
+	[request startSynchronous];
+	
+	NSString *expectedResponse = [[[NSString alloc] initWithBytes:[[request postBody] bytes] length:[[request postBody] length] encoding:[request stringEncoding]] autorelease];
+	BOOL success = ([[request responseString] isEqualToString:expectedResponse]);
+	GHAssertTrue(success,@"Failed to send form data using PUT");
+	
+	// Ensure that other methods still default to POST
+	request = [ASIFormDataRequest requestWithURL:[NSURL URLWithString:@"http://allseeing-i.com/ASIHTTPRequest/Tests/put_form_data"]];
+	[request setRequestMethod:@"DELETE"];
+	[request setPostValue:@"cheep cheep" forKey:@"hello"];
+	[request startSynchronous];
+	
+	success = ([[request responseString] isEqualToString:@"Got POST instead"]);
+	GHAssertTrue(success,@"Failed to send form data using PUT");		
+}
+
 - (void)testCopy
 - (void)testCopy
 {
 {
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
 	NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];

@@ -244,6 +244,7 @@
 	GHAssertTrue(success,@"Timeout didn't generate the correct error");
 	GHAssertTrue(success,@"Timeout didn't generate the correct error");
 	
 	
 	[ASIHTTPRequest setDefaultTimeOutSeconds:0.0001];
 	[ASIHTTPRequest setDefaultTimeOutSeconds:0.0001];
+	request = [[[ASIHTTPRequest alloc] initWithURL:url] autorelease];
 	[request startSynchronous];
 	[request startSynchronous];
 	
 	
 	success = [[request error] code] == ASIRequestTimedOutErrorType;
 	success = [[request error] code] == ASIRequestTimedOutErrorType;