Skip to content

O
Openfire
Commit 77942590 authored by Dele Olajide's avatar Dele Olajide
Browse files
Options

Merge pull request #178 from tevans/OF-869 

OF-869: Upgrade to latest Jetty (9.2.7)
I would like to pull this right now as I am currently investigating why Jetty is no more working in plugins. I would like to resolve any issues with this upgrade at the same time
parents 2ff9c063 bdbbfebe
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 25 deletions
build/lib/versions.txt
View file @ 77942590
...@@ -16,26 +16,30 @@ dom4j.jar | 1.6.1 ...@@ -16,26 +16,30 @@ dom4j.jar | 1.6.1
concurrentlinkedhashmap-lru | concurrentlinkedhashmap-lru-1.0_jdk5 | Apache 2.0 concurrentlinkedhashmap-lru | concurrentlinkedhashmap-lru-1.0_jdk5 | Apache 2.0
dbutil.jar | Jive Code, no release version. | GPL dbutil.jar | Jive Code, no release version. | GPL
hsqldb.jar | 1.8.0.5 | BSD (http://hsqldb.org/web/hsqlLicense.html) hsqldb.jar | 1.8.0.5 | BSD (http://hsqldb.org/web/hsqlLicense.html)
jetty-continuation.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-continuation.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-http.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-http.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-io.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-io.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-security.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-jmx.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-server.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-security.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-servlet.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-server.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-servlets.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-servlet.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-util.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-servlets.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-webapp.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-util.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-websocket.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-webapp.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
jetty-xml.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 jetty-xml.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
spdy-client.jar | Jetty 9.1.5.v20140505 (see #3) | Apache 2.0, Eclipse 1.0 spdy-client.jar | Jetty 9.2.7.v20150116 (see #2) | Apache 2.0, Eclipse 1.0
spdy-core.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 spdy-core.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
spdy-http.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 spdy-http-server.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
spdy-http-common.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 spdy-http-common.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
spdy-server.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 spdy-server.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
websocket-api.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 websocket-api.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
websocket-common.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 websocket-common.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
websocket-server.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 websocket-client.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
websocket-servlet.jar | Jetty 9.1.5.v20140505 | Apache 2.0, Eclipse 1.0 websocket-server.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
websocket-servlet.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
javax-websocket-client-impl.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
javax-websocket-server-impl.jar | Jetty 9.2.7.v20150116 | Apache 2.0, Eclipse 1.0
javax.websocket-api.jar | Jetty 9.2.7.v20150116 | CDDL+GPL 1.1 (https://glassfish.java.net/public/CDDL+GPL_1_1.html)
jasper-compiler.jar | Jetty 6.1.0 (5.5.15) | jasper-compiler.jar | Jetty 6.1.0 (5.5.15) |
jasper-runtime.jar | Jetty 6.1.0 (5.5.15) | jasper-runtime.jar | Jetty 6.1.0 (5.5.15) |
jaxen.jar | 1.1 beta 4 (from DOM4J 1.6.1) | Apache 1.1 jaxen.jar | 1.1 beta 4 (from DOM4J 1.6.1) | Apache 1.1
...@@ -68,8 +72,8 @@ postgres.jar | 9.3-1101.jdbc4 ...@@ -68,8 +72,8 @@ postgres.jar | 9.3-1101.jdbc4
proxool.jar | 0.9.0RC3+ (see note #1) | Apache 1.1 (http://proxool.sourceforge.net/licence.html) proxool.jar | 0.9.0RC3+ (see note #1) | Apache 1.1 (http://proxool.sourceforge.net/licence.html)
rome.jar | 0.9 | Apache 2.0 rome.jar | 0.9 | Apache 2.0
rome-fetcher.jar | 0.9 | Apache 2.0 rome-fetcher.jar | 0.9 | Apache 2.0
servlet-api.jar | 3.1 - from Jetty 9.1.5.v20140505 | servlet-api.jar | 3.1 - from Jetty 9.2.7.v20150116 |
servlet-api-schemas.jar | 3.1 - from Jetty 9.1.5.v20140505 | servlet-api-schemas.jar | 3.1 - from Jetty 9.2.7.v20150116 |
shaj.jar | 0.5 | Apache 2.0 shaj.jar | 0.5 | Apache 2.0
sitemesh.jar | 2.2.1 | Apache 1.1 sitemesh.jar | 2.2.1 | Apache 1.1
slf4j-api | 1.7.7 | http://www.slf4j.org/license.html slf4j-api | 1.7.7 | http://www.slf4j.org/license.html
...@@ -78,8 +82,6 @@ standard.jar | Jakarta standard taglib 1.1.2 ...@@ -78,8 +82,6 @@ standard.jar | Jakarta standard taglib 1.1.2
tinder.jar | 1.3.0-SNAPSHOT (Bamboo nightly build 960, SVN revision 13509)| Apache 2.0 tinder.jar | 1.3.0-SNAPSHOT (Bamboo nightly build 960, SVN revision 13509)| Apache 2.0
xmltask.jar | 1.11 | Apache 1.1 xmltask.jar | 1.11 | Apache 1.1
xpp3.jar | XPP_3 1.1.4c | BSD (http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt) xpp3.jar | XPP_3 1.1.4c | BSD (http://www.extreme.indiana.edu/viewcvs/~checkout~/XPP3/java/LICENSE.txt)
xalan.jar | 2.7.1 | Apache 2.0
......
src/java/org/jivesoftware/openfire/http/HttpBindManager.java
View file @ 77942590
...@@ -116,6 +116,10 @@ public final class HttpBindManager { ...@@ -116,6 +116,10 @@ public final class HttpBindManager {
public static final String HTTP_BIND_CORS_MAX_AGE_DEFAULT = "86400"; public static final String HTTP_BIND_CORS_MAX_AGE_DEFAULT = "86400";
public static final String HTTP_BIND_REQUEST_HEADER_SIZE = "httpbind.request.header.size";
public static final int HTTP_BIND_REQUEST_HEADER_SIZE_DEFAULT = 32768;
public static Map<String, Boolean> HTTP_BIND_ALLOWED_ORIGINS = new HashMap<String, Boolean>(); public static Map<String, Boolean> HTTP_BIND_ALLOWED_ORIGINS = new HashMap<String, Boolean>();
private static HttpBindManager instance = new HttpBindManager(); private static HttpBindManager instance = new HttpBindManager();
...@@ -164,6 +168,7 @@ public final class HttpBindManager { ...@@ -164,6 +168,7 @@ public final class HttpBindManager {
JiveGlobals.migrateProperty(HTTP_BIND_FORWARDED_HOST_NAME); JiveGlobals.migrateProperty(HTTP_BIND_FORWARDED_HOST_NAME);
JiveGlobals.migrateProperty(HTTP_BIND_CORS_ENABLED); JiveGlobals.migrateProperty(HTTP_BIND_CORS_ENABLED);
JiveGlobals.migrateProperty(HTTP_BIND_CORS_ALLOW_ORIGIN); JiveGlobals.migrateProperty(HTTP_BIND_CORS_ALLOW_ORIGIN);
JiveGlobals.migrateProperty(HTTP_BIND_REQUEST_HEADER_SIZE);
PropertyEventDispatcher.addListener(new HttpServerPropertyListener()); PropertyEventDispatcher.addListener(new HttpServerPropertyListener());
this.httpSessionManager = new HttpSessionManager(); this.httpSessionManager = new HttpSessionManager();
...@@ -289,7 +294,7 @@ public final class HttpBindManager { ...@@ -289,7 +294,7 @@ public final class HttpBindManager {
private void configureProxiedConnector(HttpConfiguration httpConfig) { private void configureProxiedConnector(HttpConfiguration httpConfig) {
// Check to see if we are deployed behind a proxy // Check to see if we are deployed behind a proxy
// Refer to http://docs.codehaus.org/display/JETTY/Configuring+Connectors // Refer to http://eclipse.org/jetty/documentation/current/configuring-connectors.html
if (isXFFEnabled()) { if (isXFFEnabled()) {
ForwardedRequestCustomizer customizer = new ForwardedRequestCustomizer(); ForwardedRequestCustomizer customizer = new ForwardedRequestCustomizer();
// default: "X-Forwarded-For" // default: "X-Forwarded-For"
...@@ -315,6 +320,7 @@ public final class HttpBindManager { ...@@ -315,6 +320,7 @@ public final class HttpBindManager {
httpConfig.addCustomizer(customizer); httpConfig.addCustomizer(customizer);
} }
httpConfig.setRequestHeaderSize(JiveGlobals.getIntProperty(HTTP_BIND_REQUEST_HEADER_SIZE, HTTP_BIND_REQUEST_HEADER_SIZE_DEFAULT));
} }
private String getBindInterface() { private String getBindInterface() {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023