From 3040aafee96c2d8c67886274cb8516dfbfcc19c2 Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Mon, 17 Oct 2011 14:35:56 -0500 Subject: [PATCH] [Issue #72] More fixes to construction of URL from relative path, preventing scheme from incorrectly changing :// to :/ --- AFNetworking/AFHTTPClient.m | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 3e2e2a3..d670b8f 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -82,11 +82,12 @@ static NSString * AFBase64EncodedStringFromString(NSString *string) { } static NSURL * AFURLWithPathRelativeToURL(NSString *path, NSURL *baseURL) { - NSString *URLString = [[baseURL absoluteString] stringByAppendingPathComponent:path]; + NSURL *url = [baseURL URLByAppendingPathComponent:[path stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"/"]]]; + NSString *URLString = [url absoluteString]; if ([path hasSuffix:@"/"]) { URLString = [URLString stringByAppendingString:@"/"]; } - + return [NSURL URLWithString:URLString]; }