diff options
author | Alexander Kurtakov | 2021-02-24 21:43:24 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2021-02-24 21:43:24 +0000 |
commit | 65516c134599893cbfe118a65980bc5008f54269 (patch) | |
tree | 7fef3de6925ae5ab1fda2a9a4a5b03cc3eb0b21f | |
parent | e440465071ff54c53317824dc33a2c0ad33ee85a (diff) | |
download | rt.equinox.bundles-65516c134599893cbfe118a65980bc5008f54269.tar.gz rt.equinox.bundles-65516c134599893cbfe118a65980bc5008f54269.tar.xz rt.equinox.bundles-65516c134599893cbfe118a65980bc5008f54269.zip |
Bug 571423 - Update to jetty-9.4.37.v20210219Y20210316-1310Y20210316-0510Y20210315-1000Y20210314-1000Y20210313-1000Y20210312-2250Y20210312-1250Y20210312-1000Y20210311-1000Y20210310-1000Y20210309-1000Y20210307-1000Y20210306-1000Y20210305-1000Y20210304-1000Y20210303-1000Y20210301-1000Y20210228-1000Y20210227-1000Y20210226-1000Y20210225-1000S4_19_0_RC2S4_19_0_RC1R4_19I20210303-1800I20210303-0600I20210302-1800I20210302-0930I20210302-0720I20210302-0600I20210301-1800I20210301-0600I20210228-1800I20210228-0600I20210227-1800I20210227-0600I20210226-2140I20210226-1800I20210226-0220I20210224-1800
Enforce LEGACY HttpCompliance so escaped / in urls no longer cause 400
return code.
Change-Id: If4d27a79323a515c546ec5ea388d471bc2011bc2
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
-rw-r--r-- | bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java | 7 |
1 files changed, 4 insertions, 3 deletions
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 68f4fd307..0b8bad686 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 javax.servlet.http.*; 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 @@ public class HttpServerManager implements ManagedServiceFactory { 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 @@ public class HttpServerManager implements ManagedServiceFactory { 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); |