Skip to content

Commit

Permalink
Merge pull request #36 from samply/hotfix/updateTomcatConfigPatches
Browse files Browse the repository at this point in the history
Fix: update server.xml patches due to the recent changes in server.xml
  • Loading branch information
torbrenner committed Sep 11, 2023
2 parents c225004 + 4d2137a commit d178e06
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 13 deletions.
2 changes: 2 additions & 0 deletions changelog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
## Unreleased
### Fixed
- update server.xml patches due to the recent changes in server.xml file
## [0.7.5] - 2023-04-13
### Fixed
- also adjusted location in dockerfile
Expand Down
8 changes: 4 additions & 4 deletions tomcat/config/server.relaxedQueryChars.patch
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"
16 changes: 7 additions & 9 deletions tomcat/config/server.reverseproxy.patch
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"

0 comments on commit d178e06

Please sign in to comment.