Skip to content
This repository has been archived by the owner on Jan 13, 2022. It is now read-only.

improvement for fieldName #767

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
26 changes: 23 additions & 3 deletions src/Three20Network/Sources/TTURLRequest.m
Expand Up @@ -240,12 +240,20 @@ - (NSData*)generatePostBody {
NSData* data = [_files objectAtIndex:i]; NSData* data = [_files objectAtIndex:i];
NSString* mimeType = [_files objectAtIndex:i+1]; NSString* mimeType = [_files objectAtIndex:i+1];
NSString* fileName = [_files objectAtIndex:i+2]; NSString* fileName = [_files objectAtIndex:i+2];

NSString* fieldName = [_files objectAtIndex:i+3];

[body appendData:[beginLine dataUsingEncoding:NSUTF8StringEncoding]]; [body appendData:[beginLine dataUsingEncoding:NSUTF8StringEncoding]];
[body appendData:[[NSString stringWithFormat: if([fieldName length])
[body appendData:[[NSString stringWithFormat:
@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n", @"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",
fileName, fileName] fileName, fieldName]
dataUsingEncoding:_charsetForMultipart]]; dataUsingEncoding:_charsetForMultipart]];
else
[body appendData:[[NSString stringWithFormat:
@"Content-Disposition: form-data; name=\"%@\"; filename=\"%@\"\r\n",
fileName, fileName]
dataUsingEncoding:_charsetForMultipart]];

[body appendData:[[NSString stringWithFormat:@"Content-Length: %d\r\n", data.length] [body appendData:[[NSString stringWithFormat:@"Content-Length: %d\r\n", data.length]
dataUsingEncoding:_charsetForMultipart]]; dataUsingEncoding:_charsetForMultipart]];
[body appendData:[[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", mimeType] [body appendData:[[NSString stringWithFormat:@"Content-Type: %@\r\n\r\n", mimeType]
Expand Down Expand Up @@ -351,6 +359,18 @@ - (void)addFile:(NSData*)data mimeType:(NSString*)mimeType fileName:(NSString*)f
[_files addObject:fileName]; [_files addObject:fileName];
} }


///////////////////////////////////////////////////////////////////////////////////////////////////
- (void)addFile:(NSData*)data mimeType:(NSString*)mimeType fileName:(NSString*)fileName fieldName:(NSString*)fieldName {
if (!_files) {
_files = [[NSMutableArray alloc] init];
}

[_files addObject:data];
[_files addObject:mimeType];
[_files addObject:fileName];
[_files addObject:fieldName];
}



/////////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////////
- (BOOL)send { - (BOOL)send {
Expand Down