mirror of
https://github.com/spring-projects/spring-boot.git
synced 2024-09-03 04:26:12 +08:00
Upgrade to Tomcat 10.1.7
Closes gh-34582
This commit is contained in:
parent
d9e8629ed4
commit
daba3ce52b
@ -5,7 +5,7 @@ org.gradle.parallel=true
|
|||||||
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
org.gradle.jvmargs=-Xmx2g -Dfile.encoding=UTF-8
|
||||||
|
|
||||||
kotlinVersion=1.8.10
|
kotlinVersion=1.8.10
|
||||||
tomcatVersion=10.1.5
|
tomcatVersion=10.1.7
|
||||||
nativeBuildToolsVersion=0.9.20
|
nativeBuildToolsVersion=0.9.20
|
||||||
|
|
||||||
kotlin.stdlib.default.dependency=false
|
kotlin.stdlib.default.dependency=false
|
||||||
|
@ -989,8 +989,13 @@ public class ServerProperties {
|
|||||||
+ "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16
|
+ "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16
|
||||||
+ "169\\.254\\.\\d{1,3}\\.\\d{1,3}|" // 169.254/16
|
+ "169\\.254\\.\\d{1,3}\\.\\d{1,3}|" // 169.254/16
|
||||||
+ "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8
|
+ "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8
|
||||||
|
+ "100\\.6[4-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
|
+ "100\\.[7-9]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
|
+ "100\\.1[0-1]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
|
+ "100\\.12[0-7]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
+ "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
+ "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
||||||
+ "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" //
|
+ "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
||||||
|
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
||||||
+ "0:0:0:0:0:0:0:1|::1";
|
+ "0:0:0:0:0:0:0:1|::1";
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -412,8 +412,13 @@ class TomcatWebServerFactoryCustomizerTests {
|
|||||||
+ "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16
|
+ "192\\.168\\.\\d{1,3}\\.\\d{1,3}|" // 192.168/16
|
||||||
+ "169\\.254\\.\\d{1,3}\\.\\d{1,3}|" // 169.254/16
|
+ "169\\.254\\.\\d{1,3}\\.\\d{1,3}|" // 169.254/16
|
||||||
+ "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8
|
+ "127\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}|" // 127/8
|
||||||
|
+ "100\\.6[4-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
|
+ "100\\.[7-9]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
|
+ "100\\.1[0-1]{1}\\d{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
|
+ "100\\.12[0-7]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 100.64.0.0/10
|
||||||
+ "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
+ "172\\.1[6-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
||||||
+ "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" //
|
+ "172\\.2[0-9]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
||||||
|
+ "172\\.3[0-1]{1}\\.\\d{1,3}\\.\\d{1,3}|" // 172.16/12
|
||||||
+ "0:0:0:0:0:0:0:1|::1";
|
+ "0:0:0:0:0:0:0:1|::1";
|
||||||
assertThat(remoteIpValve.getInternalProxies()).isEqualTo(expectedInternalProxies);
|
assertThat(remoteIpValve.getInternalProxies()).isEqualTo(expectedInternalProxies);
|
||||||
}
|
}
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2012-2022 the original author or authors.
|
* Copyright 2012-2023 the original author or authors.
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@ -24,7 +24,6 @@ import java.net.URLStreamHandler;
|
|||||||
import java.net.URLStreamHandlerFactory;
|
import java.net.URLStreamHandlerFactory;
|
||||||
|
|
||||||
import jakarta.servlet.ServletContainerInitializer;
|
import jakarta.servlet.ServletContainerInitializer;
|
||||||
import org.apache.catalina.webresources.TomcatURLStreamHandlerFactory;
|
|
||||||
import org.eclipse.jetty.util.component.AbstractLifeCycle;
|
import org.eclipse.jetty.util.component.AbstractLifeCycle;
|
||||||
import org.eclipse.jetty.webapp.WebAppContext;
|
import org.eclipse.jetty.webapp.WebAppContext;
|
||||||
|
|
||||||
@ -64,13 +63,14 @@ class JasperInitializer extends AbstractLifeCycle {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@SuppressWarnings("deprecation")
|
||||||
protected void doStart() throws Exception {
|
protected void doStart() throws Exception {
|
||||||
if (this.initializer == null) {
|
if (this.initializer == null) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (ClassUtils.isPresent("org.apache.catalina.webresources.TomcatURLStreamHandlerFactory",
|
if (ClassUtils.isPresent("org.apache.catalina.webresources.TomcatURLStreamHandlerFactory",
|
||||||
getClass().getClassLoader())) {
|
getClass().getClassLoader())) {
|
||||||
TomcatURLStreamHandlerFactory.register();
|
org.apache.catalina.webresources.TomcatURLStreamHandlerFactory.register();
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
try {
|
try {
|
||||||
|
@ -35,10 +35,12 @@ final class TldPatterns {
|
|||||||
Set<String> skipPatterns = new LinkedHashSet<>();
|
Set<String> skipPatterns = new LinkedHashSet<>();
|
||||||
skipPatterns.add("annotations-api.jar");
|
skipPatterns.add("annotations-api.jar");
|
||||||
skipPatterns.add("ant-junit*.jar");
|
skipPatterns.add("ant-junit*.jar");
|
||||||
skipPatterns.add("ant-launcher.jar");
|
skipPatterns.add("ant-launcher*.jar");
|
||||||
skipPatterns.add("ant.jar");
|
skipPatterns.add("ant*.jar");
|
||||||
skipPatterns.add("asm-*.jar");
|
skipPatterns.add("asm-*.jar");
|
||||||
skipPatterns.add("aspectj*.jar");
|
skipPatterns.add("aspectj*.jar");
|
||||||
|
skipPatterns.add("bcel*.jar");
|
||||||
|
skipPatterns.add("biz.aQute.bnd*.jar");
|
||||||
skipPatterns.add("bootstrap.jar");
|
skipPatterns.add("bootstrap.jar");
|
||||||
skipPatterns.add("catalina-ant.jar");
|
skipPatterns.add("catalina-ant.jar");
|
||||||
skipPatterns.add("catalina-ha.jar");
|
skipPatterns.add("catalina-ha.jar");
|
||||||
@ -51,6 +53,7 @@ final class TldPatterns {
|
|||||||
skipPatterns.add("commons-beanutils*.jar");
|
skipPatterns.add("commons-beanutils*.jar");
|
||||||
skipPatterns.add("commons-codec*.jar");
|
skipPatterns.add("commons-codec*.jar");
|
||||||
skipPatterns.add("commons-collections*.jar");
|
skipPatterns.add("commons-collections*.jar");
|
||||||
|
skipPatterns.add("commons-compress*.jar");
|
||||||
skipPatterns.add("commons-daemon.jar");
|
skipPatterns.add("commons-daemon.jar");
|
||||||
skipPatterns.add("commons-dbcp*.jar");
|
skipPatterns.add("commons-dbcp*.jar");
|
||||||
skipPatterns.add("commons-digester*.jar");
|
skipPatterns.add("commons-digester*.jar");
|
||||||
@ -93,6 +96,8 @@ final class TldPatterns {
|
|||||||
skipPatterns.add("mail*.jar");
|
skipPatterns.add("mail*.jar");
|
||||||
skipPatterns.add("objenesis-*.jar");
|
skipPatterns.add("objenesis-*.jar");
|
||||||
skipPatterns.add("oraclepki.jar");
|
skipPatterns.add("oraclepki.jar");
|
||||||
|
skipPatterns.add("org.hamcrest.core_*.jar");
|
||||||
|
skipPatterns.add("org.junit_*.jar");
|
||||||
skipPatterns.add("oro-*.jar");
|
skipPatterns.add("oro-*.jar");
|
||||||
skipPatterns.add("servlet-api-*.jar");
|
skipPatterns.add("servlet-api-*.jar");
|
||||||
skipPatterns.add("servlet-api.jar");
|
skipPatterns.add("servlet-api.jar");
|
||||||
@ -111,6 +116,7 @@ final class TldPatterns {
|
|||||||
skipPatterns.add("tomcat-util.jar");
|
skipPatterns.add("tomcat-util.jar");
|
||||||
skipPatterns.add("tomcat-websocket.jar");
|
skipPatterns.add("tomcat-websocket.jar");
|
||||||
skipPatterns.add("tools.jar");
|
skipPatterns.add("tools.jar");
|
||||||
|
skipPatterns.add("unboundid-ldapsdk-*.jar");
|
||||||
skipPatterns.add("websocket-api.jar");
|
skipPatterns.add("websocket-api.jar");
|
||||||
skipPatterns.add("websocket-client-api.jar");
|
skipPatterns.add("websocket-client-api.jar");
|
||||||
skipPatterns.add("wsdl4j*.jar");
|
skipPatterns.add("wsdl4j*.jar");
|
||||||
|
Loading…
Reference in New Issue
Block a user