tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject cvs commit: jakarta-tomcat-4.0/catalina/src/conf server-noexamples.xml.config
Date Sat, 08 May 2004 17:06:47 GMT
markt       2004/05/08 10:06:47

  Modified:    catalina/src/conf server-noexamples.xml.config
  Log:
  Fix bug21566. Update server-noexamples.xml to use coyote connectors.
    - Configurations copied from server.xml.
  
  Revision  Changes    Path
  1.9       +25 -12    jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config
  
  Index: server-noexamples.xml.config
  ===================================================================
  RCS file: /home/cvs/jakarta-tomcat-4.0/catalina/src/conf/server-noexamples.xml.config,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- server-noexamples.xml.config	15 Dec 2001 21:46:51 -0000	1.8
  +++ server-noexamples.xml.config	8 May 2004 17:06:47 -0000	1.9
  @@ -58,25 +58,37 @@
            IP address of the remote client.
       -->
   
  -    <!-- Define a non-SSL HTTP/1.1 Connector on port 8080 -->
  -    <Connector className="org.apache.catalina.connector.http.HttpConnector"
  +    <!-- Define a non-SSL Coyote HTTP/1.1 Connector on port 8080 -->
  +    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
                  port="8080" minProcessors="5" maxProcessors="75"
                  enableLookups="true" redirectPort="8443"
  -               acceptCount="10" debug="0" connectionTimeout="60000"/>
  +               acceptCount="100" debug="0" connectionTimeout="20000"
  +               useURIValidationHack="false" disableUploadTimeout="true" />
       <!-- Note : To disable connection timeouts, set connectionTimeout value 
  -     to -1 -->
  +     to 0 -->
   
  -    <!-- Define an SSL HTTP/1.1 Connector on port 8443 -->
  +    <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
       <!--
  -    <Connector className="org.apache.catalina.connector.http.HttpConnector"
  +    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
                  port="8443" minProcessors="5" maxProcessors="75"
                  enableLookups="true"
  -	       acceptCount="10" debug="0" scheme="https" secure="true">
  -      <Factory className="org.apache.catalina.net.SSLServerSocketFactory"
  -               clientAuth="false" protocol="TLS"/>
  +               acceptCount="100" debug="0" scheme="https" secure="true"
  +               useURIValidationHack="false" disableUploadTimeout="true">
  +      <Factory className="org.apache.coyote.tomcat4.CoyoteServerSocketFactory"
  +               clientAuth="false" protocol="TLS" />
       </Connector>
       -->
   
  +    <!-- Define a Coyote/JK2 AJP 1.3 Connector on port 8009 -->
  +    <!--
  +    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
  +               port="8009" minProcessors="5" maxProcessors="75"
  +               enableLookups="true" redirectPort="8443"
  +               acceptCount="10" debug="0" connectionTimeout="0"
  +               useURIValidationHack="false"
  +               protocolHandlerClassName="org.apache.jk.server.JkCoyoteHandler"/>
  +    -->
  +
       <!-- Define an AJP 1.3 Connector on port 8009 -->
       <!--
       <Connector className="org.apache.ajp.tomcat4.Ajp13Connector"
  @@ -87,11 +99,12 @@
       <!-- Define a Proxied HTTP/1.1 Connector on port 8081 -->
       <!-- See proxy documentation for more information about using this. -->
       <!--
  -    <Connector className="org.apache.catalina.connector.http.HttpConnector"
  +    <Connector className="org.apache.coyote.tomcat4.CoyoteConnector"
                  port="8081" minProcessors="5" maxProcessors="75"
                  enableLookups="true"
  -               acceptCount="10" debug="0" connectionTimeout="60000"
  -               proxyPort="80"/>
  +               acceptCount="100" debug="0" connectionTimeout="20000"
  +               proxyPort="80" useURIValidationHack="false"
  +               disableUploadTimeout="true" />
       -->
   
       <!-- Define a non-SSL HTTP/1.0 Test Connector on port 8082 -->
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: tomcat-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: tomcat-dev-help@jakarta.apache.org


Mime
View raw message