From 1fae83a77716b75396edd5d7b9e3265dec198354 Mon Sep 17 00:00:00 2001
From: Michael Kirk <michael@signal.org>
Date: Tue, 2 Apr 2019 19:58:04 -0600
Subject: [PATCH] respect any CDN headers (eg Host for front)

---
 SignalMessaging/profiles/OWSProfileManager.m | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/SignalMessaging/profiles/OWSProfileManager.m b/SignalMessaging/profiles/OWSProfileManager.m
index 7eb698855..e3a723a61 100644
--- a/SignalMessaging/profiles/OWSProfileManager.m
+++ b/SignalMessaging/profiles/OWSProfileManager.m
@@ -1233,10 +1233,19 @@ typedef void (^ProfileManagerFailureBlock)(NSError *error);
             });
         };
 
-        NSURL *avatarUrlPath =
-            [NSURL URLWithString:userProfile.avatarUrlPath relativeToURL:self.avatarHTTPManager.baseURL];
-        NSURLRequest *request = [NSURLRequest requestWithURL:avatarUrlPath];
-        NSURLSessionDownloadTask *downloadTask = [self.avatarHTTPManager downloadTaskWithRequest:request
+        NSURL *avatarUrl = [NSURL URLWithString:userProfile.avatarUrlPath relativeToURL:self.avatarHTTPManager.baseURL];
+        NSError *serializationError;
+        NSMutableURLRequest *request =
+            [self.avatarHTTPManager.requestSerializer requestWithMethod:@"GET"
+                                                              URLString:avatarUrl.absoluteString
+                                                             parameters:nil
+                                                                  error:&serializationError];
+        if (serializationError) {
+            OWSFailDebug(@"serializationError: %@", serializationError);
+            return;
+        }
+
+        __block NSURLSessionDownloadTask *downloadTask = [self.avatarHTTPManager downloadTaskWithRequest:request
             progress:^(NSProgress *_Nonnull downloadProgress) {
                 OWSLogVerbose(
                     @"Downloading avatar for %@ %f", userProfile.recipientId, downloadProgress.fractionCompleted);