You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by bi...@apache.org on 2004/02/17 07:28:57 UTC
cvs commit: jakarta-tomcat/src/etc modules.xml server.xml
billbarker 2004/02/16 22:28:57
Modified: src/etc modules.xml server.xml
Log:
Add back CoyoteConnector as an alias.
Make the CoyoteConnector the default Connector.
Revision Changes Path
1.17 +1 -5 jakarta-tomcat/src/etc/modules.xml
Index: modules.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/modules.xml,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- modules.xml 3 Oct 2003 08:31:08 -0000 1.16
+++ modules.xml 17 Feb 2004 06:28:57 -0000 1.17
@@ -21,11 +21,7 @@
<module name="Http10Connector" javaClass="org.apache.tomcat.modules.server.Http10Interceptor"/>
-<!-- No more present in JTC HEAD
-
-<module name="CoyoteConnector" javaClass="org.apache.coyote.tomcat3.CoyoteInterceptor"/>
-
--->
+<module name="CoyoteConnector" javaClass="org.apache.coyote.tomcat3.CoyoteInterceptor2"/>
<module name="CoyoteConnector2" javaClass="org.apache.coyote.tomcat3.CoyoteInterceptor2"/>
1.102 +11 -13 jakarta-tomcat/src/etc/server.xml
Index: server.xml
===================================================================
RCS file: /home/cvs/jakarta-tomcat/src/etc/server.xml,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- server.xml 1 Oct 2003 09:49:58 -0000 1.101
+++ server.xml 17 Feb 2004 06:28:57 -0000 1.102
@@ -178,7 +178,7 @@
-->
<!-- ==================== Connectors ==================== -->
- <!-- new http adapter. Attributes:
+ <!-- old http adapter. Attributes:
secure - use SSL ( https )
keystore, keypass - certs for SSL
port
@@ -186,12 +186,13 @@
by default report Tomcat Web Server ...
set an empty string to avoid sending server header
-->
+ <!-- Uncomment this if useing a 1.1 JDK
<Http10Connector port="8080"
secure="false"
maxThreads="100"
maxSpareThreads="50"
minSpareThreads="10" />
-
+ -->
<!--
Uncomment this for SSL support. You _need_ to set up a
server certificate if you want this to work, and you
@@ -211,20 +212,18 @@
-->
<!--
- Uncomment for HTTP 1.1 support using the Coyote adapter and
+ HTTP 1.1 support using the Coyote adapter and
and Http11 processor from jakarta-tomcat-connectors.
Note: CoyoteConnector supports the same attributes as
Http10Connector
-->
- <!--
- <CoyoteConnector2 port="8081"
+ <CoyoteConnector port="8080"
maxThreads="150" minSpareThreads="25" maxSpareThreads="75"
- enableLookups="false" redirectPort="8443" acceptCount="100"
+ enableLookups="false" acceptCount="100"
debug="0" connectionTimeout="20000"
disableUploadTimeout="true" />
- -->
<!-- Note : To disable connection timeouts, set connectionTimeout value
to -1 -->
@@ -246,6 +245,7 @@
-->
<JniConnector />
+
<!-- Apache AJP12 support. This is also used to shut down tomcat.
Parameter "address" defines network interface this Interceptor
"binds" to. Add it if you want to "bind" to just "127.0.0.1".
@@ -275,15 +275,13 @@
tomcatAuthentication="false"
-->
-
+ <!-- old JK support. Uncomment if you need to use a 1.1 JDK
<Ajp13Connector port="8009" />
+ -->
- <!-- Jk2 support using coyote. Uncomment and comment Ajp13Connector
- -->
- <!--
- <CoyoteConnector2 processorClassName="org.apache.jk.server.JkCoyoteHandler"
+ <!-- Jk2 support using coyote. -->
+ <CoyoteConnector processorClassName="org.apache.jk.server.JkCoyoteHandler"
port="8009" />
- -->
<!--
Context definitions can be placed here ( not recommended ) or
---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org