- rel 10; properly log stdout/stderr from jsvc; wait up to 360s for tomcat to start

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

--- 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 @@
          Define a non-SSL HTTP/1.1 Connector on port 8080
     -->
     <Connector port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
+	       connectionTimeout="20000"
+	       URIEncoding="UTF-8"
                redirectPort="8443" />
     <!-- A "Connector" using the shared thread pool-->
     <!--
     <Connector executor="tomcatThreadPool"
                port="8080" protocol="HTTP/1.1"
-               connectionTimeout="20000"
+	       connectionTimeout="20000"
+	       URIEncoding="UTF-8"
                redirectPort="8443" />
     -->
     <!-- Define a SSL HTTP/1.1 Connector on port 8443
@@ -83,12 +85,12 @@
          described in the APR 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"
                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" />
 
 
     <!-- An Engine represents the entry point (within Catalina) that processes