up to 7.0.67

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

diff --git a/server.xml-URIEncoding-utf8.patch b/server.xml-URIEncoding-utf8.patch
index 7eeda6172fcd5d26ce7b4bf2fc2b0085409607ba..7c22914a1cb6782b18918ea7fa4d0017c810ada6 100644 (file)
--- a/server.xml-URIEncoding-utf8.patch
+++ b/server.xml-URIEncoding-utf8.patch
@@ -1,5 +1,5 @@
---- 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
+--- 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 @@
           Define a non-SSL HTTP/1.1 Connector on port 8080
      -->
@@ -18,18 +18,18 @@
                 redirectPort="8443" />
      -->
      <!-- Define a SSL HTTP/1.1 Connector on port 8443
-@@ -83,12 +85,12 @@
-          described in the APR documentation -->
+@@ -86,12 +86,12 @@
+          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" />
++    <Connector port="8009" protocol="AJP/1.3" redirectPort="8443" URIEncoding="UTF-8" />
  
  
      <!-- An Engine represents the entry point (within Catalina) that processes