From 54194a3cb63b503fe8484e7339657d49f688003e Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Wed, 18 Jan 2012 16:51:58 -0800 Subject: [PATCH] [Issue #138] Adding double CRLF to multipart form final boundary Minor refactoring of AFHTTPClient --- AFNetworking/AFHTTPClient.m | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 91a4d1b..aefb2cb 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -32,7 +32,6 @@ #import #endif -static NSString * const kAFMultipartFormLineDelimiter = @"\r\n"; // CRLF static NSString * const kAFMultipartFormBoundary = @"Boundary+0xAbCdEfGbOuNdArY"; @interface AFMultipartFormData : NSObject { @@ -376,16 +375,18 @@ static NSString * AFPropertyListStringFromParameters(NSDictionary *parameters) { #pragma mark - +static NSString * const kAFMultipartFormCRLF = @"\r\n"; + static inline NSString * AFMultipartFormInitialBoundary() { - return [NSString stringWithFormat:@"--%@%@", kAFMultipartFormBoundary, kAFMultipartFormLineDelimiter]; + return [NSString stringWithFormat:@"--%@%@", kAFMultipartFormBoundary, kAFMultipartFormCRLF]; } static inline NSString * AFMultipartFormEncapsulationBoundary() { - return [NSString stringWithFormat:@"%@--%@%@", kAFMultipartFormLineDelimiter, kAFMultipartFormBoundary, kAFMultipartFormLineDelimiter]; + return [NSString stringWithFormat:@"%@--%@%@", kAFMultipartFormCRLF, kAFMultipartFormBoundary, kAFMultipartFormCRLF]; } static inline NSString * AFMultipartFormFinalBoundary() { - return [NSString stringWithFormat:@"%@--%@--", kAFMultipartFormLineDelimiter, kAFMultipartFormBoundary]; + return [NSString stringWithFormat:@"%@--%@--%@%@", kAFMultipartFormCRLF, kAFMultipartFormBoundary, kAFMultipartFormCRLF, kAFMultipartFormCRLF]; } @interface AFMultipartFormData () @@ -430,10 +431,10 @@ static inline NSString * AFMultipartFormFinalBoundary() { } for (NSString *field in [headers allKeys]) { - [self appendString:[NSString stringWithFormat:@"%@: %@%@", field, [headers valueForKey:field], kAFMultipartFormLineDelimiter]]; + [self appendString:[NSString stringWithFormat:@"%@: %@%@", field, [headers valueForKey:field], kAFMultipartFormCRLF]]; } - [self appendString:kAFMultipartFormLineDelimiter]; + [self appendString:kAFMultipartFormCRLF]; [self appendData:body]; }