200 OK response on status.html for redirect handler

1 files changed, 6 insertions, 2 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java
index 32c0628186a..7798b5e6ae3 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/SecuredRedirectHandler.java
@@ -21,6 +21,8 @@ import java.util.Map;
  */
 class SecuredRedirectHandler extends HandlerWrapper {
 
+    private static final String HEALTH_CHECK_PATH = "/status.html";
+
     private final Map<Integer, Integer> redirectMap;
 
     SecuredRedirectHandler(List<ConnectorConfig> connectorConfigs) {
@@ -35,8 +37,10 @@ class SecuredRedirectHandler extends HandlerWrapper {
             return;
         }
         servletResponse.setContentLength(0);
-        servletResponse.sendRedirect(
-                URIUtil.newURI("https", request.getServerName(), redirectMap.get(localPort), request.getRequestURI(), request.getQueryString()));
+        if (!servletRequest.getRequestURI().equals(HEALTH_CHECK_PATH)) {
+            servletResponse.sendRedirect(
+                    URIUtil.newURI("https", request.getServerName(), redirectMap.get(localPort), request.getRequestURI(), request.getQueryString()));
+        }
         request.setHandled(true);
     }