Revert "Use Jetty v9.4.7"

2 files changed, 5 insertions, 6 deletions

diff --git a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
index bc14a063cd1..735bf3ed89a 100644
--- a/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
+++ b/jdisc_http_service/src/main/java/com/yahoo/jdisc/http/server/jetty/ServletResponseController.java
@@ -184,7 +184,8 @@ public class ServletResponseController {
 
     private static void setHeaders_holdingLock(Response jdiscResponse, HttpServletResponse servletResponse) {
         for (final Map.Entry<String, String> entry : jdiscResponse.headers().entries()) {
-            servletResponse.addHeader(entry.getKey(), entry.getValue());
+            final String value = entry.getValue();
+            servletResponse.addHeader(entry.getKey(), value != null ? value : "");
         }
 
         if (servletResponse.getContentType() == null) {
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
index 55dec64e967..7ed13decbf6 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerTest.java
@@ -371,7 +371,6 @@ public class HttpServerTest {
     }
 
     // Header with no value is disallowed by https://tools.ietf.org/html/rfc7230#section-3.2
-    // Details in https://github.com/eclipse/jetty.project/issues/1116
     @Test
     public void requireThatHeaderWithNullValueIsOmitted() throws Exception {
         final TestDriver driver = TestDrivers.newInstance(new EchoWithHeaderRequestHandler("X-Foo", null));
@@ -381,14 +380,13 @@ public class HttpServerTest {
         assertThat(driver.close(), is(true));
     }
 
-    // Header with empty value is allowed by https://tools.ietf.org/html/rfc7230#section-3.2
-    // Details in https://github.com/eclipse/jetty.project/issues/1116
+    // Header with no value is disallowed by https://tools.ietf.org/html/rfc7230#section-3.2
     @Test
-    public void requireThatHeaderWithEmptyValueIsAllowed() throws Exception {
+    public void requireThatHeaderWithEmptyValueIsOmitted() throws Exception {
         final TestDriver driver = TestDrivers.newInstance(new EchoWithHeaderRequestHandler("X-Foo", ""));
         driver.client().get("/status.html")
                 .expectStatusCode(is(OK))
-                .expectHeader("X-Foo", is(""));
+                .expectNoHeader("X-Foo");
         assertThat(driver.close(), is(true));
     }