Issue #5443 - Forwarding Headers are optional

Additional NPE safety checks. Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
jetty · Oct 13, 2020 · 457025b · 457025b
1 parent ea11030
commit 457025b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java b/jetty-server/src/main/java/org/eclipse/jetty/server/ForwardedRequestCustomizer.java
@@ -522,8 +522,9 @@ else if (forwarded._secureScheme)
             // Don't change port if port == IMPLIED.
 
             // Update authority if different from metadata
-            if (!host.equalsIgnoreCase(requestURI.getHost()) ||
-                port != requestURI.getPort())
+            if (requestURI != null && host != null &&
+                (!host.equalsIgnoreCase(requestURI.getHost()) ||
+                    port != requestURI.getPort()))
             {
                 httpFields.put(new HostPortHttpField(host, port));
                 request.setAuthority(host, port);