diff options
Diffstat (limited to 'www/jakarta-tomcat41/files/patch-aa')
| -rw-r--r-- | www/jakarta-tomcat41/files/patch-aa | 70 |
1 files changed, 51 insertions, 19 deletions
diff --git a/www/jakarta-tomcat41/files/patch-aa b/www/jakarta-tomcat41/files/patch-aa index 2d5226b4dc0f..a36415faf578 100644 --- a/www/jakarta-tomcat41/files/patch-aa +++ b/www/jakarta-tomcat41/files/patch-aa @@ -1,5 +1,5 @@ ---- conf/server.xml.orig Sat Mar 30 18:58:31 2002 -+++ conf/server.xml Sat Mar 30 19:00:01 2002 +--- conf/server.xml.orig Tue Sep 3 11:27:46 2002 ++++ conf/server.xml Tue Sep 3 11:30:25 2002 @@ -10,7 +10,7 @@ define subcomponents such as "Valves" or "Loggers" at this level. --> @@ -8,37 +8,69 @@ +<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN" debug="0"> - <!-- A "Service" is a collection of one or more "Connectors" that share -@@ -51,9 +51,9 @@ + <!-- Uncomment these entries to enable JMX MBeans support --> +@@ -82,16 +82,16 @@ IP address of the remote client. --> -- <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 --> -+ <!-- Define a non-SSL HTTP/1.1 Connector --> - <Connector className="org.apache.catalina.connector.http.HttpConnector" +- <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 --> ++ <!-- Define a non-SSL Coyote HTTP/1.1 Connector --> + <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" - port="8080" minProcessors="5" maxProcessors="75" + port="%%HTTP_PORT%%" minProcessors="5" maxProcessors="75" enableLookups="true" redirectPort="8443" - acceptCount="10" debug="0" connectionTimeout="60000"/> + acceptCount="10" debug="0" connectionTimeout="20000" + useURIValidationHack="false" /> <!-- Note : To disable connection timeouts, set connectionTimeout value -@@ -70,9 +70,9 @@ + to -1 --> + +- <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 --> ++ <!-- Define a SSL Coyote HTTP/1.1 Connector --> + <!-- + <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" + port="8443" minProcessors="5" maxProcessors="75" +@@ -103,22 +103,22 @@ </Connector> --> +- <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 --> ++ <!-- Define a Coyote/JK2 AJP 1.3 Connector --> + <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" +- port="8009" minProcessors="5" maxProcessors="75" ++ port="%%AJP_1_3_PORT%%" minProcessors="5" maxProcessors="75" + enableLookups="true" redirectPort="8443" + acceptCount="10" debug="0" connectionTimeout="20000" + useURIValidationHack="false" + protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/> + - <!-- Define an AJP 1.3 Connector on port 8009 --> + <!-- Define an AJP 1.3 Connector --> + <!-- <Connector className="org.apache.ajp.tomcat4.Ajp13Connector" -- port="8009" minProcessors="5" maxProcessors="75" -+ port="%%AJP_1_3_PORT%%" minProcessors="5" maxProcessors="75" + port="8009" minProcessors="5" maxProcessors="75" acceptCount="10" debug="0"/> + --> - <!-- Define a Proxied HTTP/1.1 Connector on port 8081 --> -@@ -310,7 +310,7 @@ - <Service name="Tomcat-Apache"> +- <!-- Define a Proxied HTTP/1.1 Connector on port 8082 --> ++ <!-- Define a Proxied HTTP/1.1 Connector --> + <!-- See proxy documentation for more information about using this. --> + <!-- + <Connector className="org.apache.coyote.tomcat4.CoyoteConnector" +@@ -128,7 +128,7 @@ + proxyPort="80" useURIValidationHack="false" /> + --> - <Connector className="org.apache.catalina.connector.warp.WarpConnector" -- port="8008" minProcessors="5" maxProcessors="75" -+ port="%%WARP_PORT%%" minProcessors="5" maxProcessors="75" - enableLookups="true" appBase="webapps" - acceptCount="10" debug="0"/> +- <!-- Define a non-SSL legacy HTTP/1.1 Test Connector on port 8083 --> ++ <!-- Define a non-SSL legacy HTTP/1.1 Test Connector --> + <!-- + <Connector className="org.apache.catalina.connector.http.HttpConnector" + port="8083" minProcessors="5" maxProcessors="75" +@@ -136,7 +136,7 @@ + acceptCount="10" debug="0" /> + --> +- <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8084 --> ++ <!-- Define a non-SSL HTTP/1.0 Test Connector --> + <!-- + <Connector className="org.apache.catalina.connector.http10.HttpConnector" + port="8084" minProcessors="5" maxProcessors="75" |