From b94a636542142e4d18f9fe0782e7e980db222f1a Mon Sep 17 00:00:00 2001
From: Alex Hart <alex@signal.org>
Date: Fri, 21 Aug 2020 14:03:28 -0300
Subject: [PATCH] Apply Content-Range and Content-Length headers to resumable
 upload request.

---
 .../signalservice/internal/push/PushServiceSocket.java     | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
index 97ca25280..0d41fad8c 100644
--- a/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
+++ b/libsignal/service/src/main/java/org/whispersystems/signalservice/internal/push/PushServiceSocket.java
@@ -1128,13 +1128,18 @@ public class PushServiceSocket {
     Request.Builder request = new Request.Builder().url(urlBuilder.build())
                                                    .post(RequestBody.create(null, ""));
     for (Map.Entry<String, String> header : headers.entrySet()) {
-      request.header(header.getKey(), header.getValue());
+      if (!header.getKey().equalsIgnoreCase("host")) {
+        request.header(header.getKey(), header.getValue());
+      }
     }
 
     if (connectionHolder.getHostHeader().isPresent()) {
       request.header("host", connectionHolder.getHostHeader().get());
     }
 
+    request.addHeader("Content-Length", "0");
+    request.addHeader("Content-Type", "application/octet-stream");
+
     Call call = okHttpClient.newCall(request.build());
 
     synchronized (connections) {