Rediff patches.

diff --git a/server.xml-URIEncoding-utf8.patch b/server.xml-URIEncoding-utf8.patch
index 0a7f8bc9ce1b51d68f7337a885780ffc4eca8bab..373eb66f6c25740cd8194003b1e25659e85a7274 100644 (file)
--- a/server.xml-URIEncoding-utf8.patch
+++ b/server.xml-URIEncoding-utf8.patch
@@ -1,6 +1,7 @@
---- apache-tomcat-7.0.55-src/conf/server.xml~  2014-09-19 16:23:41.000000000 +0300
-+++ apache-tomcat-7.0.55-src/conf/server.xml   2014-09-19 16:24:20.849354198 +0300
-@@ -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,8 +18,8 @@
 +             URIEncoding="UTF-8"
                 redirectPort="8443" />
      -->
-     <!-- Define a SSL HTTP/1.1 Connector on port 8443
-@@ -87,7 +87,7 @@
+     <!-- Define an SSL HTTP/1.1 Connector on port 8443
+@@ -85,7 +87,7 @@
           documentation -->
      <!--
      <Connector port="8443" protocol="org.apache.coyote.http11.Http11Protocol"
@@ -27,7 +28,7 @@
                 clientAuth="false" sslProtocol="TLS" />
      -->
  
-@@ -96,6 +96,7 @@
+@@ -94,6 +96,7 @@
      <Connector protocol="AJP/1.3"
                 address="::1"
                 port="8009"
@@ -35,4 +36,3 @@
                 redirectPort="8443" />
      -->
  
-

diff --git a/tomcat-userdir.patch b/tomcat-userdir.patch
index 3623395ffefd0d189bb1f56c8e255a467cad019d..99a14215b81ea8690f502f4d1e83be0bc449ab25 100644 (file)
--- a/tomcat-userdir.patch
+++ b/tomcat-userdir.patch
@@ -1,8 +1,9 @@
---- apache-tomcat-6.0.29-src/conf/server.xml~  2010-11-17 17:41:58.451654998 +0100
-+++ apache-tomcat-6.0.29-src/conf/server.xml   2010-11-21 15:05:44.259477500 +0100
-@@ -142,6 +142,46 @@
-         <Valve className="org.apache.catalina.valves.AccessLogValve" directory="logs"  
-                prefix="localhost_access_log." suffix=".txt" pattern="common" resolveHosts="false"/>
+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      2021-11-24 10:19:04.426573110 +0100
++++ apache-tomcat-7.0.107-src/conf/server.xml  2021-11-24 10:19:04.699920632 +0100
+@@ -137,6 +137,46 @@
+         <!--
+         <Valve className="org.apache.catalina.authenticator.SingleSignOn" />
          -->
 +      <!--
 +              Automatically map a request URI starting with a tilde
@@ -45,5 +46,5 @@
 +              userClass="org.apache.catalina.startup.LDAPUserDatabase"/>
 +      -->
  
-       </Host>
-     </Engine>
+         <!-- Access log processes all example.
+              Documentation at: /docs/config/valve.html