[flume] branch trunk updated: Explicitly set header

[rgoers]

This is an automated email from the ASF dual-hosted git repository.

rgoers pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/flume.git


The following commit(s) were added to refs/heads/trunk by this push:
     new ea69968  Explicitly set header
ea69968 is described below

commit ea6996884d661faaabf3773dde0052278bd2c230
Author: Ralph Goers <rgo...@apache.org>
AuthorDate: Sun Jan 30 13:44:03 2022 -0700

    Explicitly set header
---
 .../main/java/org/apache/flume/node/net/UrlConnectionFactory.java | 8 +++++++-
 .../java/org/apache/flume/node/TestHttpConfigurationSource.java   | 1 -
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git 
a/flume-ng-node/src/main/java/org/apache/flume/node/net/UrlConnectionFactory.java
 
b/flume-ng-node/src/main/java/org/apache/flume/node/net/UrlConnectionFactory.java
index 21e4f26..02a5aa7 100644
--- 
a/flume-ng-node/src/main/java/org/apache/flume/node/net/UrlConnectionFactory.java
+++ 
b/flume-ng-node/src/main/java/org/apache/flume/node/net/UrlConnectionFactory.java
@@ -20,6 +20,10 @@ import java.io.IOException;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.net.URLConnection;
+import java.time.Instant;
+import java.time.ZoneOffset;
+import java.time.ZonedDateTime;
+import java.time.format.DateTimeFormatter;
 import javax.net.ssl.HttpsURLConnection;
 
 /**
@@ -60,7 +64,9 @@ public class UrlConnectionFactory {
     }
     urlConnection.setRequestProperty("Content-Type", getContentType(url));
     if (lastModifiedMillis > 0) {
-      urlConnection.setIfModifiedSince(lastModifiedMillis);
+      ZonedDateTime zdt = 
Instant.ofEpochMilli(lastModifiedMillis).atZone(ZoneOffset.UTC);
+      String lastModified = DateTimeFormatter.RFC_1123_DATE_TIME.format(zdt);
+      urlConnection.setRequestProperty("If-Modified-Since", lastModified);
     }
     return urlConnection;
   }
diff --git 
a/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
 
b/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
index 31503a6..f45a3fe 100644
--- 
a/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
+++ 
b/flume-ng-node/src/test/java/org/apache/flume/node/TestHttpConfigurationSource.java
@@ -31,7 +31,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.flume.conf.ConfigurationException;
 import org.apache.flume.node.net.AuthorizationProvider;
 import org.apache.flume.node.net.BasicAuthorizationProvider;
-import org.apache.log4j.LogManager;
 import org.eclipse.jetty.http.HttpHeader;
 import org.eclipse.jetty.server.Server;
 import org.eclipse.jetty.server.ServerConnector;