Cleanups

@@ -55,12 +55,7 @@
 	// Set your own boundary string only if really obsessive. We don't bother to check if post data contains the boundary, since it's pretty unlikely that it does.
 	// Set your own boundary string only if really obsessive. We don't bother to check if post data contains the boundary, since it's pretty unlikely that it does.
 	NSString *stringBoundary = @"0xKhTmLbOuNdArY";
 	NSString *stringBoundary = @"0xKhTmLbOuNdArY";
 	
 	
-	//if ([fileData count] > 0) {
-		// We need to use multipart/form-data when using file upload
 	[self addRequestHeader:@"Content-Type" value:[NSString stringWithFormat:@"multipart/form-data; boundary=%@",stringBoundary]];
 	[self addRequestHeader:@"Content-Type" value:[NSString stringWithFormat:@"multipart/form-data; boundary=%@",stringBoundary]];
-	//}
-	
-	
 	
 	
 	[body appendData:[[NSString stringWithFormat:@"--%@\r\n",stringBoundary] dataUsingEncoding:NSUTF8StringEncoding]];
 	[body appendData:[[NSString stringWithFormat:@"--%@\r\n",stringBoundary] dataUsingEncoding:NSUTF8StringEncoding]];
 	
 	
@@ -86,9 +81,7 @@
 		NSString *filePath = [fileData objectForKey:key];
 		NSString *filePath = [fileData objectForKey:key];
 		[body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",key,[filePath lastPathComponent]] dataUsingEncoding:NSUTF8StringEncoding]];
 		[body appendData:[[NSString stringWithFormat:@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",key,[filePath lastPathComponent]] dataUsingEncoding:NSUTF8StringEncoding]];
 		[body appendData:contentTypeHeader];
 		[body appendData:contentTypeHeader];
-		//[body appendData: [NSData dataWithContentsOfFile:filePath options:NSUncachedRead error:NULL]];
-		//[body appendData:[NSData dataWithContentsOfMappedFile:filePath]];
-		[body appendData:[NSData dataWithContentsOfFile:filePath]];
+		[body appendData: [NSData dataWithContentsOfFile:filePath options:NSUncachedRead error:NULL]];
 		i++;
 		i++;
 		// Only add the boundary if this is not the last item in the post body
 		// Only add the boundary if this is not the last item in the post body
 		if (i != [fileData count]) { 
 		if (i != [fileData count]) { 

@@ -139,8 +139,10 @@
 	// Also see the comments in ASINetworkQueue.h
 	// Also see the comments in ASINetworkQueue.h
 	BOOL showAccurateProgress;
 	BOOL showAccurateProgress;
 	
 	
+	//Used to ensure the progress indicator is only incremented once when showAccurateProgress = NO
 	BOOL updatedProgress;
 	BOOL updatedProgress;
 	
 	
+	//Prevents the body of the post being built more than once (largely for subclasses)
 	BOOL haveBuiltPostBody;
 	BOOL haveBuiltPostBody;
 }
 }
 
 
@@ -160,9 +162,6 @@
 
 
 - (BOOL)isFinished; //Same thing, for NSOperationQueues to read
 - (BOOL)isFinished; //Same thing, for NSOperationQueues to read
 
 
-// Get total amount of data received so far for this request
-- (int)totalBytesRead;
-
 // Returns the contents of the result as an NSString (not appropriate for binary data!)
 // Returns the contents of the result as an NSString (not appropriate for binary data!)
 - (NSString *)dataString;
 - (NSString *)dataString;
 
 
@@ -285,4 +284,5 @@
 @property (assign) BOOL useCachedContentLength;
 @property (assign) BOOL useCachedContentLength;
 @property (retain) ASIHTTPRequest *mainRequest;
 @property (retain) ASIHTTPRequest *mainRequest;
 @property (assign) BOOL showAccurateProgress;
 @property (assign) BOOL showAccurateProgress;
+@property (assign,readonly) unsigned int totalBytesRead;
 @end
 @end