Up to 7.0.109; 7.x series is EOL now

[packages/tomcat.git] / server.xml-URIEncoding-utf8.patch

diff --git a/server.xml-URIEncoding-utf8.patch b/server.xml-URIEncoding-utf8.patch
index 7eeda6172fcd5d26ce7b4bf2fc2b0085409607ba..373eb66f6c25740cd8194003b1e25659e85a7274 100644 (file)
--- a/server.xml-URIEncoding-utf8.patch
+++ b/server.xml-URIEncoding-utf8.patch
@@ -1,6 +1,7 @@
---- apache-tomcat-7.0.26-src/conf/server.xml   2012-02-17 15:15:30.000000000 +0100
-+++ apache-tomcat-7.0.26-src.new/conf/server.xml       2012-03-19 10:08:10.806085375 +0100
-@@ -68,13 +68,15 @@
+diff -urNp -x '*.orig' apache-tomcat-7.0.107-src.org/conf/server.xml apache-tomcat-7.0.107-src/conf/server.xml
+--- apache-tomcat-7.0.107-src.org/conf/server.xml      2020-11-18 13:24:51.000000000 +0100
++++ apache-tomcat-7.0.107-src/conf/server.xml  2021-11-24 10:18:43.615492909 +0100
+@@ -69,13 +69,15 @@
           Define a non-SSL HTTP/1.1 Connector on port 8080
      -->
      <Connector port="8080" protocol="HTTP/1.1"
@@ -17,19 +18,21 @@
 +             URIEncoding="UTF-8"
                 redirectPort="8443" />
      -->
-     <!-- Define a SSL HTTP/1.1 Connector on port 8443
-@@ -83,12 +85,12 @@
-          described in the APR documentation -->
+     <!-- Define an SSL HTTP/1.1 Connector on port 8443
+@@ -85,7 +87,7 @@
+          documentation -->
      <!--
-     <Connector port="8443" protocol="HTTP/1.1" SSLEnabled="true"
--               maxThreads="150" scheme="https" secure="true"
-+               maxThreads="150" scheme="https" secure="true" URIEncoding="UTF-8"
+     <Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol"
+-               maxThreads="150" SSLEnabled="true" scheme="https" secure="true"
++               maxThreads="150" SSLEnabled="true" scheme="https" secure="true" URIEncoding="UTF-8"
                 clientAuth="false" sslProtocol="TLS" />
      -->
  
-     <!-- Define an AJP 1.3 Connector on port 8009 -->
--    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" />
-+    <Connector port="8009" protocol="AJP/1.3" URIEncoding="UTF-8" redirectPort="8443" />
- 
+@@ -94,6 +96,7 @@
+     <Connector protocol="AJP/1.3"
+                address="::1"
+                port="8009"
++               URIEncoding="UTF-8"
+                redirectPort="8443" />
+     -->
  
-     <!-- An Engine represents the entry point (within Catalina) that processes