From 119ff309acbe293e8fab7ef8adc39bbb4069992c Mon Sep 17 00:00:00 2001
From: tiagosalvado10 <9038083+tiagosalvado10@users.noreply.github.com>
Date: Thu, 29 Sep 2022 16:17:23 +0100
Subject: [PATCH] [MNT-23241] Prevent duplicated default headers if key/value
 pair is already in the request, otherwise, header is added (#1454)

* [MNT-23241] Prevent duplicated default headers if key/value pair is already in the request, otherwise, header is added
---
 .../org/alfresco/httpclient/RequestHeadersHttpClient.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/org/alfresco/httpclient/RequestHeadersHttpClient.java b/core/src/main/java/org/alfresco/httpclient/RequestHeadersHttpClient.java
index 78e5d36727..15ddff141c 100644
--- a/core/src/main/java/org/alfresco/httpclient/RequestHeadersHttpClient.java
+++ b/core/src/main/java/org/alfresco/httpclient/RequestHeadersHttpClient.java
@@ -21,6 +21,7 @@ package org.alfresco.httpclient;
 import java.io.IOException;
 import java.util.Map;
 
+import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.HttpException;
@@ -57,7 +58,12 @@ public class RequestHeadersHttpClient extends HttpClient
         if (defaultHeaders != null)
         {
             defaultHeaders.forEach((k,v) -> {
-                method.addRequestHeader(k, v);
+                Header h = method.getRequestHeader(k);
+                boolean add = h == null || h.getValue() == null || !h.getValue().equals(v);
+                if (add)
+                {
+                    method.addRequestHeader(k, v);
+                }
             });
         }        
     }