-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #36 from samply/hotfix/updateTomcatConfigPatches
Fix: update server.xml patches due to the recent changes in server.xml
- Loading branch information
Showing
3 changed files
with
13 additions
and
13 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
--- tomcat/config/server.xml 2022-11-09 19:43:47.000000000 +0100 | ||
+++ tomcat/config/server.docker.xml 2022-11-28 15:35:14.880724900 +0100 | ||
--- tomcat/config/server.xml 2023-09-08 16:02:29.398615000 +0200 | ||
+++ tomcat/config/server.docker.xml 2023-09-08 16:02:29.398615000 +0200 | ||
@@ -67,6 +67,7 @@ | ||
Define a non-SSL/TLS HTTP/1.1 Connector on port 8080 | ||
--> | ||
<Connector port="8080" protocol="HTTP/1.1" | ||
+ relaxedQueryChars="RELAXED_QUERY_CHARS" | ||
connectionTimeout="20000" | ||
redirectPort="8443" /> | ||
<!-- A "Connector" using the shared thread pool--> | ||
redirectPort="8443" | ||
maxParameterCount="1000" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,15 +1,13 @@ | ||
--- tomcat/config/server.xml 2020-04-24 12:45:09.996222000 +0200 | ||
+++ tomcat/config/server.docker.xml 2020-04-24 12:43:55.362172600 +0200 | ||
@@ -68,7 +68,11 @@ | ||
--> | ||
<Connector port="8080" protocol="HTTP/1.1" | ||
--- tomcat/config/server.xml 2023-09-08 14:42:28.509706700 +0200 | ||
+++ tomcat/config/server.docker.xml 2023-09-08 14:47:18.426826400 +0200 | ||
@@ -70,6 +70,10 @@ | ||
connectionTimeout="20000" | ||
- redirectPort="8443" /> | ||
+ redirectPort="8443" | ||
redirectPort="8443" | ||
maxParameterCount="1000" | ||
+ proxyName="TOMCAT_REVERSEPROXY_FQDN" | ||
+ proxyPort="TOMCAT_REVERSEPROXY_PORT" | ||
+ scheme="TOMCAT_REVERSEPROXY_SCHEME" | ||
+ secure="TOMCAT_REVERSEPROXY_SSL" /> | ||
+ secure="TOMCAT_REVERSEPROXY_SSL" | ||
/> | ||
<!-- A "Connector" using the shared thread pool--> | ||
<!-- | ||
<Connector executor="tomcatThreadPool" |