From eb79d535196e13a9a6b26b26ac7546423fcc698d Mon Sep 17 00:00:00 2001 From: Mattt Thompson Date: Wed, 2 Nov 2011 12:00:53 -0500 Subject: [PATCH] Return baseURL if path is nil in AFURLWithPathRelativeToURL --- AFNetworking/AFHTTPClient.m | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/AFNetworking/AFHTTPClient.m b/AFNetworking/AFHTTPClient.m index 85ccd73..0c988b1 100644 --- a/AFNetworking/AFHTTPClient.m +++ b/AFNetworking/AFHTTPClient.m @@ -82,6 +82,10 @@ static NSString * AFBase64EncodedStringFromString(NSString *string) { } static NSURL * AFURLWithPathRelativeToURL(NSString *path, NSURL *baseURL) { + if (!path) { + return baseURL; + } + NSURL *url = [baseURL URLByAppendingPathComponent:[path stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@"/"]]]; NSString *URLString = [url absoluteString]; if ([path hasSuffix:@"/"]) {