evie/AFNetworking
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

file data upload fix

Browse source
This commit is contained in:
Tyler Richey 2011-09-24 21:53:46 -04:00
parent cf0f82a74d
commit 4f070b2924
2 changed files with 20 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
AFNetworking/AFHTTPClient.h
View file

@ -37,7 +37,7 @@
}
/**
The url used as the base for paths specified in methods such as `getPath:parameters:success:failure`
The url used as the base for paths specified in methods such as `getPath:parameteres:success:failure`
*/
@property (readonly, nonatomic, retain) NSURL *baseURL;
@ -49,7 +49,7 @@
/**
The operation queue which manages operations enqueued by the HTTP client.
*/
@property (readonly, nonatomic, retain) NSOperationQueue *operationQueue;
@property (readonly, nonatomic, retain) NSOperationQueue *operationQueue;;
///---------------------------------------------
/// @name Creating and Initializing HTTP Clients
@ -267,6 +267,8 @@
*/
- (void)appendPartWithFile:(NSURL *)fileURL mimeType:(NSString *)mimeType fileName:(NSString *)fileName;
- (void)appendPartWithFileData:(NSData *)data mimeType:(NSString *)mimeType name:(NSString *)name;
/**
Appends encoded data to the form data.

25
AFNetworking/AFHTTPClient.m
View file

@ -27,11 +27,11 @@ static NSString * const kAFMultipartFormLineDelimiter = @"\r\n"; // CRLF
static NSString * const kAFMultipartFormBoundary = @"Boundary+0xAbCdEfGbOuNdArY";
static NSString * AFMultipartFormEncapsulationBoundary() {
return [NSString stringWithFormat:@"--%@", kAFMultipartFormBoundary];
return [NSString stringWithFormat:@"%@--%@%@", kAFMultipartFormLineDelimiter, kAFMultipartFormBoundary, kAFMultipartFormLineDelimiter];
}
static NSString * AFMultipartFormFinalBoundary() {
return [NSString stringWithFormat:@"--%@--", kAFMultipartFormBoundary];
return [NSString stringWithFormat:@"%@--%@--", kAFMultipartFormLineDelimiter, kAFMultipartFormBoundary];
}
@interface AFMultipartFormDataProxy : NSObject <AFMultipartFormDataProxy> {
@ -305,21 +305,17 @@ static NSString * AFURLEncodedStringFromStringWithEncoding(NSString *string, NSS
- (NSData *)data {
NSMutableData *finalizedData = [NSMutableData dataWithData:self.mutableData];
[finalizedData appendData:[AFMultipartFormFinalBoundary() dataUsingEncoding:self.stringEncoding]];
return finalizedData;
}
#pragma mark - AFMultipartFormDataProxy
- (void)appendPartWithHeaders:(NSDictionary *)headers body:(NSData *)body {
if ([self.mutableData length] > 0) {
[self appendString:AFMultipartFormEncapsulationBoundary()];
[self appendBlankLine];
}
[self appendString:AFMultipartFormEncapsulationBoundary()];
for (NSString *field in [headers allKeys]) {
[self appendString:[NSString stringWithFormat:@"%@: %@", field, [headers valueForKey:field]]];
[self appendBlankLine];
[self appendString:[NSString stringWithFormat:@"%@: %@%@", field, [headers valueForKey:field], kAFMultipartFormLineDelimiter]];
}
[self appendBlankLine];
@ -351,6 +347,17 @@ static NSString * AFURLEncodedStringFromStringWithEncoding(NSString *string, NSS
[self appendPartWithHeaders:mutableHeaders body:data];
}
- (void)appendPartWithFileData:(NSData *)data mimeType:(NSString *)mimeType name:(NSString *)name {
NSString *fileName = [[NSString stringWithFormat:@"%d", [[NSDate date] hash]] stringByAppendingPathExtension:[mimeType lastPathComponent]];
NSMutableDictionary *mutableHeaders = [NSMutableDictionary dictionary];
[mutableHeaders setValue:[NSString stringWithFormat:@"file; name=\"%@\"; filename=\"%@\"", name, fileName] forKey:@"Content-Disposition"];
[mutableHeaders setValue:mimeType forKey:@"Content-Type"];
[self appendPartWithHeaders:mutableHeaders body:data];
}
- (void)appendData:(NSData *)data {
[self.mutableData appendData:data];
}