Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkitlo2021-03-24 23:06:36 -0400
committerSravan Kumar Lakkimsetti2021-03-25 09:57:07 -0400
commit75930d8370724cce5af95365f39fd084c9e229c8 (patch)
treec9f58ec60b1a2c25eff1ef25d381a8c2f65d96cb
parent737dd58579660207fe166071bdd17748ef8d2b48 (diff)
downloadrt.equinox.bundles-75930d8370724cce5af95365f39fd084c9e229c8.tar.gz
rt.equinox.bundles-75930d8370724cce5af95365f39fd084c9e229c8.tar.xz
rt.equinox.bundles-75930d8370724cce5af95365f39fd084c9e229c8.zip
Bug 571423 - Update to jetty-9.4.37.v20210219
Change-Id: Iac9d248925c7f3bdb42b2f3c630732c22d705c83 Signed-off-by: kitlo <kitlo@us.ibm.com> Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>(cherry picked from commit 1854eb7152a6b79d0607935f5121a6c175ae66ff)
-rw-r--r--bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java7
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 ea16184f4..fd46f221f 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, 2018 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;
@@ -189,7 +190,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));
}
@@ -205,7 +206,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);

Back to the top