Bug 572586 - Update to Jetty 10.0.2
Do not use HttpCompliance but rather UriCompliance where LEGACY has no
restrictions.
Set Jetty minor version to 10.0.2 to ensure this compliance as behavior
changes in Jetty micro versions.
Change-Id: I5dbb69f7ce4d0b664e66659a6338b332898910f5
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
diff --git a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
index 8b383f5..ce6ad9e 100644
--- a/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
+++ b/bundles/org.eclipse.equinox.http.jetty/META-INF/MANIFEST.MF
@@ -9,16 +9,16 @@
Import-Package: javax.servlet;version="[3.1.0,5.0.0)",
javax.servlet.http;version="[3.1.0,5.0.0)",
org.eclipse.equinox.http.servlet;version="[1.2.0,2.0.0)",
- org.eclipse.jetty.http;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.server;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.server.handler;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.server.session;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.servlet;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.util;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.util.component;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.util.log;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.util.ssl;version="[10.0.1,11.0.0)",
- org.eclipse.jetty.util.thread;version="[10.0.1,11.0.0)",
+ org.eclipse.jetty.http;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.server;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.server.handler;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.server.session;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.servlet;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.util;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.util.component;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.util.log;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.util.ssl;version="[10.0.2,11.0.0)",
+ org.eclipse.jetty.util.thread;version="[10.0.2,11.0.0)",
org.osgi.framework;version="1.3.0",
org.osgi.framework.startlevel;version="1.0.0",
org.osgi.framework.wiring;version="1.2.0",
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 550917b..c41caa0 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
@@ -26,7 +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.http.UriCompliance;
import org.eclipse.jetty.server.*;
import org.eclipse.jetty.server.session.HouseKeeper;
import org.eclipse.jetty.server.session.SessionHandler;
@@ -182,7 +182,7 @@
// HTTPS Configuration
HttpConfiguration https_config = new HttpConfiguration(http_config);
https_config.addCustomizer(new SecureRequestCustomizer());
- https_config.setHttpCompliance(HttpCompliance.RFC7230_LEGACY);
+ https_config.setUriCompliance(UriCompliance.LEGACY);
// HTTPS connector
httpsConnector = new ServerConnector(server, new SslConnectionFactory(sslContextFactory, "http/1.1"), new HttpConnectionFactory(https_config)); //$NON-NLS-1$
@@ -200,7 +200,7 @@
http_config.setSecureScheme("https"); //$NON-NLS-1$
http_config.setSecurePort(Details.getInt(dictionary, JettyConstants.HTTPS_PORT, 443));
}
- http_config.setHttpCompliance(HttpCompliance.RFC7230_LEGACY);
+ http_config.setUriCompliance(UriCompliance.LEGACY);;
// HTTP connector
httpConnector = new ServerConnector(server, new HttpConnectionFactory(http_config));
httpConnector.setPort(Details.getInt(dictionary, JettyConstants.HTTP_PORT, 80));