Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkitlo2021-03-24 23:06:36 -0400
committerSravan Kumar Lakkimsetti2021-03-26 10:25:19 -0400
commit23ac4e8e5ee01e55b84dda68976889e1c80b5fcb (patch)
tree2fef4c6038962cc140b372e959dbab7150e984b6
parent2802427f3f6e8c4e34bf282cad7c052ded5d86c6 (diff)
downloadrt.equinox.bundles-23ac4e8e5ee01e55b84dda68976889e1c80b5fcb.tar.gz
rt.equinox.bundles-23ac4e8e5ee01e55b84dda68976889e1c80b5fcb.tar.xz
rt.equinox.bundles-23ac4e8e5ee01e55b84dda68976889e1c80b5fcb.zip
Bug 571423 - Update to jetty-9.4.37.v20210219
Conflicts: bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java Conflicts: bundles/org.eclipse.equinox.http.jetty/src/org/eclipse/equinox/http/jetty/internal/HttpServerManager.java 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 8929003b4..975743cd3 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, 2016 IBM Corporation and others.
+ * Copyright (c) 2007, 2021 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at
@@ -24,6 +24,7 @@ import javax.servlet.http.HttpSessionIdListener;
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.SessionHandler;
import org.eclipse.jetty.servlet.ServletContextHandler;
@@ -174,7 +175,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));
}
return httpsConnector;
@@ -189,7 +190,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