Bug 571423 - Update to jetty-9.4.37.v20210219
Enforce LEGACY HttpCompliance so escaped / in urls no longer cause 400
return code.
Change-Id: If4d27a79323a515c546ec5ea388d471bc2011bc2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
index 68f4fd3..0b8bad6 100644
--- a/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
+++ b/bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2020 IBM Corporation and others.
+ * Copyright (c) 2007, 2021 IBM Corporation and others.
*
* This program and the accompanying materials
* are made available under the terms of the Eclipse Public License 2.0
@@ -26,6 +26,7 @@
import org.eclipse.equinox.http.jetty.JettyConstants;
import org.eclipse.equinox.http.jetty.JettyCustomizer;
import org.eclipse.equinox.http.servlet.HttpServiceServlet;
+import org.eclipse.jetty.http.HttpCompliance;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.server.session.HouseKeeper;
import org.eclipse.jetty.server.session.SessionHandler;
@@ -183,7 +184,7 @@
https_config.addCustomizer(new SecureRequestCustomizer());
// HTTPS connector
- httpsConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config)); //$NON-NLS-1$
+ httpsConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config, HttpCompliance.LEGACY)); //$NON-NLS-1$
httpsConnector.setPort(Details.getInt(dictionary, JettyConstants.HTTPS_PORT, 443));
httpsConnector.setHost(Details.getString(dictionary, JettyConstants.HTTPS_HOST, null));
}
@@ -199,7 +200,7 @@
http_config.setSecurePort(Details.getInt(dictionary, JettyConstants.HTTPS_PORT, 443));
}
// HTTP connector
- httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config));
+ httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config, HttpCompliance.LEGACY));
httpConnector.setPort(Details.getInt(dictionary, JettyConstants.HTTP_PORT, 80));
httpConnector.setHost(Details.getString(dictionary, JettyConstants.HTTP_HOST, null));
httpConnector.setIdleTimeout(DEFAULT_IDLE_TIMEOUT);
