From 4d0a685fbbd03b406caf9750039c120573e657c1 Mon Sep 17 00:00:00 2001
From: Ernst de Haan <znerd@FreeBSD.org>
Date: Fri, 3 Jan 2003 14:03:32 +0000
Subject: Update to 4.1.18.

---
 www/tomcat41/files/patch-aa | 57 +++++++--------------------------------------
 1 file changed, 8 insertions(+), 49 deletions(-)

(limited to 'www/tomcat41/files')

diff --git a/www/tomcat41/files/patch-aa b/www/tomcat41/files/patch-aa
index a36415faf578..407a2c079ef3 100644
--- a/www/tomcat41/files/patch-aa
+++ b/www/tomcat41/files/patch-aa
@@ -1,5 +1,5 @@
---- conf/server.xml.orig	Tue Sep  3 11:27:46 2002
-+++ conf/server.xml	Tue Sep  3 11:30:25 2002
+--- conf/server.xml.orig	Fri Jan  3 14:55:15 2003
++++ conf/server.xml	Fri Jan  3 14:58:21 2003
 @@ -10,7 +10,7 @@
       define subcomponents such as "Valves" or "Loggers" at this level.
   -->
@@ -8,8 +8,8 @@
 +<Server port="%%SHUTDOWN_PORT%%" shutdown="SHUTDOWN" debug="0">
  
  
-   <!-- Uncomment these entries to enable JMX MBeans support -->
-@@ -82,16 +82,16 @@
+   <!-- Comment these entries out to disable JMX MBeans support -->
+@@ -88,9 +88,9 @@
           IP address of the remote client.
      -->
  
@@ -19,17 +19,9 @@
 -               port="8080" minProcessors="5" maxProcessors="75"
 +               port="%%HTTP_PORT%%" minProcessors="5" maxProcessors="75"
                 enableLookups="true" redirectPort="8443"
-                acceptCount="10" debug="0" connectionTimeout="20000"
-                useURIValidationHack="false" />
-     <!-- Note : To disable connection timeouts, set connectionTimeout value 
-      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 @@
+                acceptCount="100" debug="0" connectionTimeout="20000"
+                useURIValidationHack="false" disableUploadTimeout="true" />
+@@ -109,9 +109,9 @@
      </Connector>
      -->
  
@@ -39,38 +31,5 @@
 -               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"
+                acceptCount="10" debug="0" connectionTimeout="0"
                 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"
-                acceptCount="10" debug="0"/>
-     -->
- 
--    <!-- 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" />
-     -->
- 
--    <!-- 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"
-- 
cgit v1.2.3