Skip to content

HADOOP-18333. Upgrade jetty version to 9.4.48.v20220622 #4600

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 24, 2022
Merged

HADOOP-18333. Upgrade jetty version to 9.4.48.v20220622 #4600

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2397dee
HADOOP-18001. Upgrade jetty version to 9.4.44 (#3700). Contributed by…
luoyuan3471 Dec 9, 2021
207f5df
HADOOP-18333.Upgrade jetty version to 9.4.48.v20220622 (#4553)
hotcodemacha Jul 20, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 14 additions & 20 deletions LICENSE-binary
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -352,26 +352,20 @@ org.codehaus.jackson:jackson-jaxrs:1.9.13
org.codehaus.jackson:jackson-mapper-asl:1.9.13
org.codehaus.jackson:jackson-xc:1.9.13
org.codehaus.jettison:jettison:1.1
org.eclipse.jetty:jetty-annotations:9.4.40.v20210413
org.eclipse.jetty:jetty-client:9.4.40.v20210413
org.eclipse.jetty:jetty-http:9.4.40.v20210413
org.eclipse.jetty:jetty-io:9.4.40.v20210413
org.eclipse.jetty:jetty-jndi:9.4.40.v20210413
org.eclipse.jetty:jetty-plus:9.4.40.v20210413
org.eclipse.jetty:jetty-security:9.4.40.v20210413
org.eclipse.jetty:jetty-server:9.4.40.v20210413
org.eclipse.jetty:jetty-servlet:9.4.40.v20210413
org.eclipse.jetty:jetty-util:9.4.40.v20210413
org.eclipse.jetty:jetty-util-ajax:9.4.40.v20210413
org.eclipse.jetty:jetty-webapp:9.4.40.v20210413
org.eclipse.jetty:jetty-xml:9.4.40.v20210413
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.40.v20210413
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-api:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-client:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-common:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-server:9.4.40.v20210413
org.eclipse.jetty.websocket:websocket-servlet:9.4.40.v20210413
org.eclipse.jetty:jetty-annotations:9.4.48.v20220622
org.eclipse.jetty:jetty-http:9.4.48.v20220622
org.eclipse.jetty:jetty-io:9.4.48.v20220622
org.eclipse.jetty:jetty-jndi:9.4.48.v20220622
org.eclipse.jetty:jetty-plus:9.4.48.v20220622
org.eclipse.jetty:jetty-security:9.4.48.v20220622
org.eclipse.jetty:jetty-server:9.4.48.v20220622
org.eclipse.jetty:jetty-servlet:9.4.48.v20220622
org.eclipse.jetty:jetty-util:9.4.48.v20220622
org.eclipse.jetty:jetty-util-ajax:9.4.48.v20220622
org.eclipse.jetty:jetty-webapp:9.4.48.v20220622
org.eclipse.jetty:jetty-xml:9.4.48.v20220622
org.eclipse.jetty.websocket:javax-websocket-client-impl:9.4.48.v20220622
org.eclipse.jetty.websocket:javax-websocket-server-impl:9.4.48.v20220622
org.ehcache:ehcache:3.3.1
org.lz4:lz4-java:1.7.1
org.objenesis:objenesis:2.6
Expand Down
6 changes: 3 additions & 3 deletions hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/http/HttpServer2.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@
import org.eclipse.jetty.server.Server;
import org.eclipse.jetty.server.ServerConnector;
import org.eclipse.jetty.server.SslConnectionFactory;
import org.eclipse.jetty.server.handler.AllowSymLinkAliasChecker;
import org.eclipse.jetty.server.SymlinkAllowedResourceAliasChecker;
import org.eclipse.jetty.server.handler.ContextHandlerCollection;
import org.eclipse.jetty.server.handler.HandlerCollection;
import org.eclipse.jetty.server.handler.RequestLogHandler;
Expand Down Expand Up @@ -872,7 +872,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
handler.setHttpOnly(true);
handler.getSessionCookieConfig().setSecure(true);
logContext.setSessionHandler(handler);
logContext.addAliasCheck(new AllowSymLinkAliasChecker());
logContext.addAliasCheck(new SymlinkAllowedResourceAliasChecker(logContext));
setContextAttributes(logContext, conf);
addNoCacheFilter(logContext);
defaultContexts.put(logContext, true);
Expand All @@ -891,7 +891,7 @@ protected void addDefaultApps(ContextHandlerCollection parent,
handler.setHttpOnly(true);
handler.getSessionCookieConfig().setSecure(true);
staticContext.setSessionHandler(handler);
staticContext.addAliasCheck(new AllowSymLinkAliasChecker());
staticContext.addAliasCheck(new SymlinkAllowedResourceAliasChecker(staticContext));
setContextAttributes(staticContext, conf);
defaultContexts.put(staticContext, true);
}
Expand Down
2 changes: 1 addition & 1 deletion hadoop-project/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<!--Whether to proceed to next module if any test failures exist-->
<maven.test.failure.ignore>true</maven.test.failure.ignore>
<maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
<jetty.version>9.4.43.v20210629</jetty.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<test.exclude>_</test.exclude>
<test.exclude.pattern>_</test.exclude.pattern>

Expand Down