From 66e39bb9248bec2bec0171c6acce2b73c50cea7e Mon Sep 17 00:00:00 2001
From: Ashish Kataria <88022674+ashishkataria86@users.noreply.github.com>
Date: Thu, 10 Oct 2024 11:33:21 +0530
Subject: [PATCH] DESC-227

---
 store/src/java/com/zimbra/cs/service/FeedManager.java | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/store/src/java/com/zimbra/cs/service/FeedManager.java b/store/src/java/com/zimbra/cs/service/FeedManager.java
index 5e6439684f7..990466e843f 100644
--- a/store/src/java/com/zimbra/cs/service/FeedManager.java
+++ b/store/src/java/com/zimbra/cs/service/FeedManager.java
@@ -65,7 +65,6 @@
 import org.apache.http.impl.auth.BasicScheme;
 import org.apache.http.impl.client.BasicAuthCache;
 import org.apache.http.impl.client.BasicCredentialsProvider;
-import org.apache.http.impl.client.DefaultRedirectStrategy;
 import org.apache.http.impl.client.HttpClientBuilder;
 
 import com.google.common.annotations.VisibleForTesting;
@@ -405,8 +404,6 @@ private static RemoteDataInfo retrieveRemoteData(String url, Folder.SyncData fsd
                     throw ServiceException.INVALID_REQUEST("invalid url for feed: " + url, null);
                 }
 
-                DefaultRedirectStrategy redirectStrategy = new DefaultRedirectStrategy();
-                clientBuilder.setRedirectStrategy(redirectStrategy);
 
                 get.addHeader("User-Agent", HTTP_USER_AGENT);
                 get.addHeader("Accept", HTTP_ACCEPT);
@@ -415,7 +412,7 @@ private static RemoteDataInfo retrieveRemoteData(String url, Folder.SyncData fsd
                     get.addHeader("If-Modified-Since", lastSyncAt);
                 }
 
-                HttpClient client = clientBuilder.build();
+                HttpClient client = clientBuilder.disableRedirectHandling().build();
                 HttpResponse response = HttpClientUtil.executeMethod(client, get, context);
 
                 Header locationHeader = response.getFirstHeader("location");