cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2005-09-20 Thread markt 
markt   2005/09/20 15:18:41

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  Fix bug 34771 - unable to set maxHttpHeaderSize.
  Also enabled the setting of compressableMimeTypes and removed some dead code.
  
  Revision  ChangesPath
  1.36  +43 -40
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.35
  retrieving revision 1.36
  diff -u -r1.35 -r1.36
  --- CoyoteConnector.java  29 Aug 2004 17:14:41 -  1.35
  +++ CoyoteConnector.java  20 Sep 2005 22:18:40 -  1.36
  @@ -17,7 +17,6 @@
   package org.apache.coyote.tomcat4;
   
   
  -import java.util.Vector;
   import org.apache.tomcat.util.IntrospectionUtils;
   
   import org.apache.coyote.Adapter;
  @@ -96,12 +95,6 @@
   
   
   /**
  - * The set of processors that have ever been created.
  - */
  -private Vector created = new Vector();
  -
  -
  -/**
* The current number of processors that have been created.
*/
   private int curProcessors = 0;
  @@ -155,6 +148,10 @@
*/
   private int maxProcessors = 20;
   
  +/**
  + * The maximum permitted size of the request and response HTTP headers.
  + */
  +private int maxHttpHeaderSize = 4 * 1024;
   
   /**
* Linger value on the incoming connection.
  @@ -252,18 +249,6 @@
   
   
   /**
  - * The shutdown signal to our background thread
  - */
  -private boolean stopped = false;
  -
  -
  -/**
  - * The background thread.
  - */
  -private Thread thread = null;
  -
  -
  -/**
* Use TCP no delay ?
*/
   private boolean tcpNoDelay = true;
  @@ -286,6 +271,7 @@
   /**
* Compression value.
*/
  +private String compressableMimeTypes = "text/html,text/xml,text/plain";
   private String compression = "off";
   
   
  @@ -560,6 +546,22 @@
   
   }
   
  +/**
  + * Get the list of compressable MIME types.
  + */
  +public String getCompressableMimeType() {
  +return compressableMimeTypes;
  +}
  +
  +/**
  + * Set the list of compressable MIME types.
  + * 
  + * @param compressableMimeTypes The new list of MIME types to enable for
  + * compression.
  + */
  +public void setCompressableMimeType(String compressableMimeTypes) {
  +this.compressableMimeTypes = compressableMimeTypes;
  +}
   
   /**
* Get the value of compression.
  @@ -740,6 +742,23 @@
   
   }
   
  +/**
  + * Return the maximum permitted size of the HTTP request and response
  + * headers.
  + */
  +public int getMaxHttpHeaderSize() {
  +return maxHttpHeaderSize;
  +}
  +
  +/**
  + * Set the maximum permitted size of the HTTP request and response
  + * headers.
  + * 
  + * @param maxHttpHeaderSize The new maximum header size in bytes.
  + */
  +public void setMaxHttpHeaderSize(int maxHttpHeaderSize) {
  +this.maxHttpHeaderSize = maxHttpHeaderSize;
  +}
   
   /**
* Return the port number on which we listen for requests.
  @@ -1082,26 +1101,6 @@
   }
   
   
  -/**
  - * Log a message on the Logger associated with our Container (if any).
  - *
  - * @param message Message to be logged
  - * @param throwable Associated exception
  - */
  -private void log(String message, Throwable throwable) {
  -
  -Logger logger = container.getLogger();
  -String localName = "CoyoteConnector";
  -if (logger != null)
  -logger.log(localName + " " + message, throwable);
  -else {
  -System.out.println(localName + " " + message);
  -throwable.printStackTrace(System.out);
  -}
  -
  -}
  -
  -
   // -- Lifecycle 
Methods
   
   
  @@ -1198,6 +1197,10 @@
  "" + tomcatAuthentication);
   IntrospectionUtils.setProperty(protocolHandler, "compression",
  compression);
  +IntrospectionUtils.setProperty(protocolHandler, 
"compressableMimeTypes",
  +   compressableMimeTypes);
  +IntrospectionUtils.setProperty(protocolHandler, "maxHttpHeaderSize",
  +   "" + maxHttpHeaderSize);
   if (address != null) {
   IntrospectionUtils.setProperty(protocolHandler, "address",
  address);
  
  
  

-
To unsubscribe, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteServerSocketFactory.java

2004-01-25 Thread billbarker 
billbarker2004/01/25 14:54:13

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteServerSocketFactory.java
  Log:
  Update to allow the SSL connector to only "want" clientAuth.
  
  Submitted By:  Michael Becker [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.33  +6 -8  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.32
  retrieving revision 1.33
  diff -u -r1.32 -r1.33
  --- CoyoteConnector.java  23 Jan 2004 20:47:13 -  1.32
  +++ CoyoteConnector.java  25 Jan 2004 22:54:13 -  1.33
  @@ -1259,10 +1259,8 @@
   (CoyoteServerSocketFactory) factory;
   IntrospectionUtils.setProperty(protocolHandler, "algorithm",
  ssf.getAlgorithm());
  -if (ssf.getClientAuth()) {
  -IntrospectionUtils.setProperty(protocolHandler, "clientauth",
  -   "" + ssf.getClientAuth());
  -}
  + IntrospectionUtils.setProperty(protocolHandler, "clientauth",
  +   ssf.getClientAuth());
   IntrospectionUtils.setProperty(protocolHandler, "keystore",
  ssf.getKeystoreFile());
   IntrospectionUtils.setProperty(protocolHandler, "randomfile",
  
  
  
  1.6   +7 -4  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java
  
  Index: CoyoteServerSocketFactory.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteServerSocketFactory.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CoyoteServerSocketFactory.java18 Sep 2003 16:13:51 -  1.5
  +++ CoyoteServerSocketFactory.java25 Jan 2004 22:54:13 -  1.6
  @@ -73,7 +73,10 @@
* algorithm - Certificate encoding algorithm
* to use. [SunX509]
* clientAuth - Require client authentication if
  - * set to true. [false]
  + * set to true. Want client authentication if set to
  + * want. (Note: Only supported in the JSSE included with 
  + * J2SDK 1.4 and above.  Prior versions of JSSE and PureTLS will treat 
  + * 'want' as 'false'.) [false]
* keystoreFile - Pathname to the Key Store file to be
* loaded.  This must be an absolute path, or a relative path that
* is resolved against the "catalina.base" system property.
  @@ -114,13 +117,13 @@
   /**
* Should we require client authentication?
*/
  -private boolean clientAuth = false;
  +private String clientAuth = "false";
   
  -public boolean getClientAuth() {
  +public String getClientAuth() {
   return (this.clientAuth);
   }
   
  -public void setClientAuth(boolean clientAuth) {
  +public void setClientAuth(String clientAuth) {
   this.clientAuth = clientAuth;
   }
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2004-01-23 Thread markt 
markt   2004/01/23 12:47:13

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Fixing what looks like a cut and paste error to resolve a compilation error.
  
  Revision  ChangesPath
  1.32  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- CoyoteConnector.java  22 Jan 2004 03:03:35 -  1.31
  +++ CoyoteConnector.java  23 Jan 2004 20:47:13 -  1.32
  @@ -782,7 +782,7 @@
*
* @param maxSpareProcessors The new maximum of spare processors
*/
  -public void setMaxProcessors(int maxSpareProcessors) {
  +public void setMaxSpareProcessors(int maxSpareProcessors) {
   
   this.maxSpareProcessors = maxSpareProcessors;
   
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2004-01-21 Thread remm 
remm2004/01/21 08:12:45

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Add some thread pool related fields.
  
  Revision  ChangesPath
  1.30  +36 -4 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.29
  retrieving revision 1.30
  diff -u -r1.29 -r1.30
  --- CoyoteConnector.java  8 Jan 2004 22:50:32 -   1.29
  +++ CoyoteConnector.java  21 Jan 2004 16:12:45 -  1.30
  @@ -187,6 +187,12 @@
   
   
   /**
  + * The maximum amount of spare processors.
  + */
  +protected int maxSpareProcessors = 5;
  +
  +
  +/**
* The maximum number of processors allowed, or <0 for unlimited.
*/
   private int maxProcessors = 20;
  @@ -735,6 +741,28 @@
   
   
   /**
  + * Return the maximum number of spare processors allowed.
  + */
  +public int getMaxSpareProcessors() {
  +
  +return (maxSpareProcessors);
  +
  +}
  +
  +
  +/**
  + * Set the maximum number of spare processors allowed.
  + *
  + * @param maxSpareProcessors The new maximum of spare processors
  + */
  +public void setMaxProcessors(int maxSpareProcessors) {
  +
  +this.maxSpareProcessors = maxSpareProcessors;
  +
  +}
  +
  +
  +/**
* Return the port number on which we listen for requests.
*/
   public int getPort() {
  @@ -1167,6 +1195,10 @@
   IntrospectionUtils.setProperty(protocolHandler, "port", "" + port);
   IntrospectionUtils.setProperty(protocolHandler, "maxThreads",
  "" + maxProcessors);
  +IntrospectionUtils.setProperty(protocolHandler, "minSpareThreads",
  +   "" + minProcessors);
  +IntrospectionUtils.setProperty(protocolHandler, "maxSpareThreads",
  +   "" + maxSpareProcessors);
   IntrospectionUtils.setProperty(protocolHandler, "backlog",
  "" + acceptCount);
   IntrospectionUtils.setProperty(protocolHandler, "tcpNoDelay",
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2004-01-08 Thread remm 
remm2004/01/08 14:50:32

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - For the TC 4.1 branch, use the same default as in TC 4.1.27.
  
  Revision  ChangesPath
  1.29  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.28
  retrieving revision 1.29
  diff -u -r1.28 -r1.29
  --- CoyoteConnector.java  12 Dec 2003 02:44:34 -  1.28
  +++ CoyoteConnector.java  8 Jan 2004 22:50:32 -   1.29
  @@ -360,7 +360,7 @@
/**
 * URI encoding as body.
 */
  - private boolean useBodyEncodingForURI = false;
  + private boolean useBodyEncodingForURI = true;
   
   
   // - Properties
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteRequest.java

2003-12-11 Thread larryi 
larryi  2003/12/11 18:44:34

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteRequest.java
  Log:
  Port Remy's update for the useBodyEncodingForURI attribute.
  
  Revision  ChangesPath
  1.28  +32 -4 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- CoyoteConnector.java  19 Nov 2003 23:23:18 -  1.27
  +++ CoyoteConnector.java  12 Dec 2003 02:44:34 -  1.28
  @@ -357,6 +357,12 @@
private String URIEncoding = null;
   
   
  + /**
  +  * URI encoding as body.
  +  */
  + private boolean useBodyEncodingForURI = false;
  +
  +
   // - Properties
   
   
  @@ -972,6 +978,28 @@
public void setURIEncoding(String URIEncoding) {
   
this.URIEncoding = URIEncoding;
  +
  + }
  +
  +
  + /**
  +  * Return the true if the entity body encoding should be used for the URI.
  +  */
  + public boolean getUseBodyEncodingForURI() {
  +
  + return (this.useBodyEncodingForURI);
  +
  + }
  +
  +
  + /**
  +  * Set if the entity body encoding should be used for the URI.
  +  *
  +  * @param useBodyEncodingForURI The new value for the flag.
  +  */
  + public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) {
  +
  + this.useBodyEncodingForURI = useBodyEncodingForURI;
   
}
   
  
  
  
  1.35  +14 -6 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java
  
  Index: CoyoteRequest.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteRequest.java,v
  retrieving revision 1.34
  retrieving revision 1.35
  diff -u -r1.34 -r1.35
  --- CoyoteRequest.java11 Dec 2003 22:55:48 -  1.34
  +++ CoyoteRequest.java12 Dec 2003 02:44:34 -  1.35
  @@ -443,7 +443,7 @@
   /**
* Associated Catalina connector.
*/
  -protected Connector connector;
  +protected CoyoteConnector connector;
   
   /**
* Return the Connector through which this Request was received.
  @@ -458,7 +458,7 @@
* @param connector The new connector
*/
   public void setConnector(Connector connector) {
  -this.connector = connector;
  +this.connector = (CoyoteConnector) connector;
   }
   
   /**
  @@ -1927,11 +1927,19 @@
   Parameters parameters = coyoteRequest.getParameters();
   
   String enc = coyoteRequest.getCharacterEncoding();
  +boolean useBodyEncodingForURI = connector.getUseBodyEncodingForURI();
   if (enc != null) {
   parameters.setEncoding(enc);
  +if (useBodyEncodingForURI) {
  +parameters.setQueryStringEncoding(enc);
  +}
   } else {
   parameters.setEncoding
   (org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
  +if (useBodyEncodingForURI) {
  +parameters.setQueryStringEncoding
  +(org.apache.coyote.Constants.DEFAULT_CHARACTER_ENCODING);
  +}
   }
   
   parameters.handleQueryParameters();
  
  
  

-
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2003-01-15 Thread remm 
remm2003/01/15 07:15:13

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Add accessor for the protocol handler.
  
  Revision  ChangesPath
  1.21  +14 -4 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- CoyoteConnector.java  23 Dec 2002 01:32:24 -  1.20
  +++ CoyoteConnector.java  15 Jan 2003 15:15:13 -  1.21
  @@ -694,6 +694,16 @@
   
   
   /**
  + * Return the protocol handler associated with the connector.
  + */
  +public ProtocolHandler getProtocolHandler() {
  +
  +return (this.protocolHandler);
  +
  +}
  +
  +
  +/**
* Return the proxy server name for this Connector.
*/
   public String getProxyName() {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-12-23 Thread Costin Manolache 
[EMAIL PROTECTED] wrote:

>   Modified:coyote/src/java/org/apache/coyote/tomcat4
> CoyoteConnector.java
>   Log:
>   Adding the 'maxKeepAliveRequests' attribute to the Connector.  The code
>   in the Protocol and Processor has been there for a very long time.
>   
>   I'd be +1 to changing the 4.x and 4.x Connectors to (like the 3.3
>   Connector) attempt to pass all configuration attributes to the Protocol,
>   and let the Protocol decide if it care about it.

+1 ( especially for 5.0 ).


Costin

>   
>   Revision  ChangesPath
>   1.20  +25 -4
>   
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
>   
>   Index: CoyoteConnector.java
>   ===
>   RCS file:
>   
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
>   retrieving revision 1.19 retrieving revision 1.20
>   diff -u -r1.19 -r1.20
>   --- CoyoteConnector.java18 Dec 2002 18:11:10 -  1.19
>   +++ CoyoteConnector.java23 Dec 2002 01:32:24 -  1.20
>   @@ -305,6 +305,11 @@
> */
>private boolean disableUploadTimeout = false;
>
>   +/**
>   + * Maximum number of Keep-Alive requests to honor per connection.
>   + */
>   +private int maxKeepAliveRequests = 100;
>   +
>
>/**
> * Compression value.
>   @@ -778,6 +783,20 @@
>}
>
>/**
>   + * Return the maximum number of Keep-Alive requests to honor per
>   connection.
>   + */
>   +public int getMaxKeepAliveRequests() {
>   +return maxKeepAliveRequests;
>   +}
>   +
>   +/**
>   + * Set the maximum number of Keep-Alive requests to honor per
>   connection.
>   + */
>   +public void setMaxKeepAliveRequests(int mkar) {
>   +maxKeepAliveRequests = mkar;
>   +}
>   +
>   +/**
> * Return the scheme that will be assigned to requests received
> * through this connector.  Default value is "http".
> */
>   @@ -1021,6 +1040,8 @@
>   "" + connectionTimeout);
>IntrospectionUtils.setProperty(protocolHandler,
>"disableUploadTimeout",
>   "" + disableUploadTimeout);
>   +IntrospectionUtils.setProperty(protocolHandler,
>   "maxKeepAliveRequests",
>   +   "" + maxKeepAliveRequests);
>IntrospectionUtils.setProperty(protocolHandler, "compression",
>   compression);
>if (address != null) {




--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-12-22 Thread billbarker 
billbarker2002/12/22 17:32:24

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  Adding the 'maxKeepAliveRequests' attribute to the Connector.  The code in the 
Protocol and Processor has been there for a very long time.
  
  I'd be +1 to changing the 4.x and 4.x Connectors to (like the 3.3 Connector) attempt 
to pass all configuration attributes to the Protocol, and let the Protocol decide if 
it care about it.
  
  Revision  ChangesPath
  1.20  +25 -4 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- CoyoteConnector.java  18 Dec 2002 18:11:10 -  1.19
  +++ CoyoteConnector.java  23 Dec 2002 01:32:24 -  1.20
  @@ -305,6 +305,11 @@
*/
   private boolean disableUploadTimeout = false;
   
  +/**
  + * Maximum number of Keep-Alive requests to honor per connection.
  + */
  +private int maxKeepAliveRequests = 100;
  +
   
   /**
* Compression value.
  @@ -778,6 +783,20 @@
   }
   
   /**
  + * Return the maximum number of Keep-Alive requests to honor per connection.
  + */
  +public int getMaxKeepAliveRequests() {
  +return maxKeepAliveRequests;
  +}
  +
  +/**
  + * Set the maximum number of Keep-Alive requests to honor per connection.
  + */
  +public void setMaxKeepAliveRequests(int mkar) {
  +maxKeepAliveRequests = mkar;
  +}
  +
  +/**
* Return the scheme that will be assigned to requests received
* through this connector.  Default value is "http".
*/
  @@ -1021,6 +1040,8 @@
  "" + connectionTimeout);
   IntrospectionUtils.setProperty(protocolHandler, "disableUploadTimeout", 
  "" + disableUploadTimeout);
  +IntrospectionUtils.setProperty(protocolHandler, "maxKeepAliveRequests",
  +   "" + maxKeepAliveRequests);
   IntrospectionUtils.setProperty(protocolHandler, "compression", 
  compression);
   if (address != null) {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-10-10 Thread Costin Manolache 

[EMAIL PROTECTED] wrote:

> billbarker2002/10/10 19:38:23
> 
>   Modified:coyote/src/java/org/apache/coyote/tomcat4
> CoyoteConnector.java
>   Log:
>   Write 100 times: Compile, then commit.

So I'm not the only one ! :-)

-- 
Costin



--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-10-10 Thread billbarker 

billbarker2002/10/10 19:38:23

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  Write 100 times: Compile, then commit.
  
  Revision  ChangesPath
  1.17  +5 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.16
  retrieving revision 1.17
  diff -u -r1.16 -r1.17
  --- CoyoteConnector.java  11 Oct 2002 02:33:07 -  1.16
  +++ CoyoteConnector.java  11 Oct 2002 02:38:22 -  1.17
  @@ -667,7 +667,7 @@
*/
   public void setProxyName(String proxyName) {
   
  -if(! "".equals(proxyName) {
  +if(! "".equals(proxyName) ) {
   this.proxyName = proxyName;
   } else {
   this.proxyName = null;
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-10-10 Thread billbarker 

billbarker2002/10/10 19:33:08

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  Add at least minimal sanity checking on the 'proxyName' value.
  
  Now proxyName="" is the same as omitting it all together.
  
  Reported by: Jon Scott Stevens [EMAIL PROTECTED]
  
  Revision  ChangesPath
  1.16  +9 -5  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- CoyoteConnector.java  28 May 2002 14:24:31 -  1.15
  +++ CoyoteConnector.java  11 Oct 2002 02:33:07 -  1.16
  @@ -667,7 +667,11 @@
*/
   public void setProxyName(String proxyName) {
   
  -this.proxyName = proxyName;
  +if(! "".equals(proxyName) {
  +this.proxyName = proxyName;
  +} else {
  +this.proxyName = null;
  +}
   
   }
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-05-06 Thread remm 

remm02/05/06 14:43:29

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Set the address property.
  - Fixes bug 8828.
  
  Revision  ChangesPath
  1.13  +8 -4  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- CoyoteConnector.java  30 Apr 2002 20:27:37 -  1.12
  +++ CoyoteConnector.java  6 May 2002 21:43:29 -   1.13
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.12 2002/04/30 20:27:37 remm Exp $
  - * $Revision: 1.12 $
  - * $Date: 2002/04/30 20:27:37 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.13 2002/05/06 21:43:29 remm Exp $
  + * $Revision: 1.13 $
  + * $Date: 2002/05/06 21:43:29 $
*
* 
*
  @@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.12 $ $Date: 2002/04/30 20:27:37 $
  + * @version $Revision: 1.13 $ $Date: 2002/05/06 21:43:29 $
*/
   
   
  @@ -960,6 +960,10 @@
  "" + connectionTimeout);
   IntrospectionUtils.setProperty(protocolHandler, "timeout", 
  "" + connectionTimeout);
  +if (address != null) {
  +IntrospectionUtils.setProperty(protocolHandler, "address", 
  +   address);
  +}
   
   // Configure secure socket factory
   if (factory instanceof CoyoteServerSocketFactory) {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-04-30 Thread remm 

remm02/04/30 13:27:37

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Only start the endpoint in start, to avoid processing requests using a non
fully initialized pipeline.
  
  Revision  ChangesPath
  1.12  +12 -12
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CoyoteConnector.java  26 Apr 2002 20:13:36 -  1.11
  +++ CoyoteConnector.java  30 Apr 2002 20:27:37 -  1.12
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.11 2002/04/26 20:13:36 remm Exp $
  - * $Revision: 1.11 $
  - * $Date: 2002/04/26 20:13:36 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.12 2002/04/30 20:27:37 remm Exp $
  + * $Revision: 1.12 $
  + * $Date: 2002/04/30 20:27:37 $
*
* 
*
  @@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.11 $ $Date: 2002/04/26 20:13:36 $
  + * @version $Revision: 1.12 $ $Date: 2002/04/30 20:27:37 $
*/
   
   
  @@ -991,14 +991,6 @@
  "" + false);
   }
   
  -try {
  -protocolHandler.init();
  -} catch (Exception e) {
  -throw new LifecycleException
  -(sm.getString
  - ("coyoteConnector.protocolHandlerInitializationFailed", e));
  -}
  -
   }
   
   
  @@ -1015,6 +1007,14 @@
   (sm.getString("coyoteConnector.alreadyStarted"));
   lifecycle.fireLifecycleEvent(START_EVENT, null);
   started = true;
  +
  +try {
  +protocolHandler.init();
  +} catch (Exception e) {
  +throw new LifecycleException
  +(sm.getString
  + ("coyoteConnector.protocolHandlerInitializationFailed", e));
  +}
   
   }
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-04-26 Thread remm 

remm02/04/26 13:13:36

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Set the timeout attribute.
  
  Revision  ChangesPath
  1.11  +6 -4  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- CoyoteConnector.java  18 Apr 2002 18:12:46 -  1.10
  +++ CoyoteConnector.java  26 Apr 2002 20:13:36 -  1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.10 2002/04/18 18:12:46 remm Exp $
  - * $Revision: 1.10 $
  - * $Date: 2002/04/18 18:12:46 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.11 2002/04/26 20:13:36 remm Exp $
  + * $Revision: 1.11 $
  + * $Date: 2002/04/26 20:13:36 $
*
* 
*
  @@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.10 $ $Date: 2002/04/18 18:12:46 $
  + * @version $Revision: 1.11 $ $Date: 2002/04/26 20:13:36 $
*/
   
   
  @@ -957,6 +957,8 @@
   IntrospectionUtils.setProperty(protocolHandler, "tcpNoDelay", 
  "" + tcpNoDelay);
   IntrospectionUtils.setProperty(protocolHandler, "soTimeout", 
  +   "" + connectionTimeout);
  +IntrospectionUtils.setProperty(protocolHandler, "timeout", 
  "" + connectionTimeout);
   
   // Configure secure socket factory
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-04-16 Thread remm 

remm02/04/16 16:45:14

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Tweak the value of the "secure" and the "clientauth" attributes, to make the
SSL configuration identical to what it was before.
  
  Revision  ChangesPath
  1.9   +18 -11
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CoyoteConnector.java  10 Apr 2002 23:50:33 -  1.8
  +++ CoyoteConnector.java  16 Apr 2002 23:45:14 -  1.9
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.8 2002/04/10 23:50:33 costin Exp $
  - * $Revision: 1.8 $
  - * $Date: 2002/04/10 23:50:33 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.9 2002/04/16 23:45:14 remm Exp $
  + * $Revision: 1.9 $
  + * $Date: 2002/04/16 23:45:14 $
*
* 
*
  @@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.8 $ $Date: 2002/04/10 23:50:33 $
  + * @version $Revision: 1.9 $ $Date: 2002/04/16 23:45:14 $
*/
   
   
  @@ -945,7 +945,9 @@
   }
   protocolHandler.setAdapter(adapter);
   
  -IntrospectionUtils.setProperty(protocolHandler, "jkHome", 
System.getProperty("catalina.base"));
  +IntrospectionUtils.setProperty(protocolHandler, "jkHome", 
  +   System.getProperty("catalina.base"));
  +
   // Set attributes
   IntrospectionUtils.setProperty(protocolHandler, "port", "" + port);
   IntrospectionUtils.setProperty(protocolHandler, "maxThreads", 
  @@ -957,16 +959,18 @@
   IntrospectionUtils.setProperty(protocolHandler, "soTimeout", 
  "" + connectionTimeout);
   
  -IntrospectionUtils.setProperty(protocolHandler, "secure", 
  -   "" + secure);
  -
   // Configure secure socket factory
   if (factory instanceof CoyoteServerSocketFactory) {
  -CoyoteServerSocketFactory ssf = (CoyoteServerSocketFactory) factory;
  +IntrospectionUtils.setProperty(protocolHandler, "secure", 
  +   "" + true);
  +CoyoteServerSocketFactory ssf = 
  +(CoyoteServerSocketFactory) factory;
   IntrospectionUtils.setProperty(protocolHandler, "algorithm", 
  ssf.getAlgorithm());
  -IntrospectionUtils.setProperty(protocolHandler, "clientauth", 
  -   "" + ssf.getClientAuth());
  +if (ssf.getClientAuth()) {
  +IntrospectionUtils.setProperty(protocolHandler, "clientauth", 
  +   "" + ssf.getClientAuth());
  +}
   IntrospectionUtils.setProperty(protocolHandler, "keystore", 
  ssf.getKeystoreFile());
   IntrospectionUtils.setProperty(protocolHandler, "keypass", 
  @@ -980,6 +984,9 @@
  ssf.getSSLImplementation());
   IntrospectionUtils.setProperty(protocolHandler, "socketFactory", 
  ssf.getSocketFactoryName());
  +} else {
  +IntrospectionUtils.setProperty(protocolHandler, "secure", 
  +   "" + false);
   }
   
   try {
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-04-10 Thread costin 

costin  02/04/10 16:50:33

  Modified:coyote/src/java/org/apache/coyote/tomcat3
CoyoteInterceptor2.java
   coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  Set 'jkHome' with the server-specific values ( catalina.base or tomcat.home )
  
  Revision  ChangesPath
  1.9   +2 -0  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java
  
  Index: CoyoteInterceptor2.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat3/CoyoteInterceptor2.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- CoyoteInterceptor2.java   10 Apr 2002 05:01:01 -  1.8
  +++ CoyoteInterceptor2.java   10 Apr 2002 23:50:33 -  1.9
  @@ -150,6 +150,8 @@
   } catch( Exception ex ) {
   ex.printStackTrace();
   }
  +
  +this.setAttribute("jkHome", cm.getHome());
   
   proto.setAdapter( adapter );
   try {
  
  
  
  1.8   +5 -4  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- CoyoteConnector.java  9 Apr 2002 22:27:11 -   1.7
  +++ CoyoteConnector.java  10 Apr 2002 23:50:33 -  1.8
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.7 2002/04/09 22:27:11 remm Exp $
  - * $Revision: 1.7 $
  - * $Date: 2002/04/09 22:27:11 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.8 2002/04/10 23:50:33 costin Exp $
  + * $Revision: 1.8 $
  + * $Date: 2002/04/10 23:50:33 $
*
* 
*
  @@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.7 $ $Date: 2002/04/09 22:27:11 $
  + * @version $Revision: 1.8 $ $Date: 2002/04/10 23:50:33 $
*/
   
   
  @@ -945,6 +945,7 @@
   }
   protocolHandler.setAdapter(adapter);
   
  +IntrospectionUtils.setProperty(protocolHandler, "jkHome", 
System.getProperty("catalina.base"));
   // Set attributes
   IntrospectionUtils.setProperty(protocolHandler, "port", "" + port);
   IntrospectionUtils.setProperty(protocolHandler, "maxThreads", 
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteAdapter.java CoyoteConnector2.java

2002-04-09 Thread remm 

remm02/04/09 15:27:11

  Modified:coyote/src/java/org/apache/coyote/tomcat4 CoyoteAdapter.java
  Added:   coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Removed: coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector2.java
  Log:
  - Remove the old Coyote connector (and replace it with the new JK2 enabled one).
CVS will allow restoring it if it turns out there are problems which can't be 
fixed.
  - Note: There could be lots of problems with SSL.
  
  Revision  ChangesPath
  1.3   +6 -6  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java
  
  Index: CoyoteAdapter.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoyoteAdapter.java6 Apr 2002 16:53:04 -   1.2
  +++ CoyoteAdapter.java9 Apr 2002 22:27:11 -   1.3
  @@ -1,6 +1,6 @@
  -/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
 1.2 2002/04/06 16:53:04 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/04/06 16:53:04 $
  +/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteAdapter.java,v
 1.3 2002/04/09 22:27:11 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/04/09 22:27:11 $
*
* 
*
  @@ -119,7 +119,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2002/04/06 16:53:04 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/09 22:27:11 $
*/
   
   final class CoyoteAdapter
  @@ -141,7 +141,7 @@
* @param connector CoyoteConnector that owns this processor
* @param id Identifier of this CoyoteProcessor (unique per connector)
*/
  -public CoyoteAdapter(CoyoteConnector2 connector) {
  +public CoyoteAdapter(CoyoteConnector connector) {
   
   super();
   this.connector = connector;
  @@ -156,7 +156,7 @@
   /**
* The CoyoteConnector with which this processor is associated.
*/
  -private CoyoteConnector2 connector = null;
  +private CoyoteConnector connector = null;
   
   
   /**
  
  
  
  1.7   +97 -322   
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-04-09 Thread remm 

remm02/04/09 15:25:07

  Removed: coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteProcessor.java
  Log:
  - Remove the old Coyote connector (and replace it with the new JK2 enabled one).
CVS will allow restoring it if it turns out there are problems which can't be 
fixed.
  - Note: There could be lots of problems with SSL.

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-03-22 Thread remm 

remm02/03/22 15:58:27

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Remove unused 'allowChunking' flag. The HTTP/1.1 processor has a different
mechanism to handle non-compliant clients, but it is not exposed at the moment.
  
  Revision  ChangesPath
  1.5   +4 -42 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- CoyoteConnector.java  14 Mar 2002 20:42:59 -  1.4
  +++ CoyoteConnector.java  22 Mar 2002 23:58:27 -  1.5
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.4 2002/03/14 20:42:59 remm Exp $
  - * $Revision: 1.4 $
  - * $Date: 2002/03/14 20:42:59 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.5 2002/03/22 23:58:27 remm Exp $
  + * $Revision: 1.5 $
  + * $Date: 2002/03/22 23:58:27 $
*
* 
*
  @@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.4 $ $Date: 2002/03/14 20:42:59 $
  + * @version $Revision: 1.5 $ $Date: 2002/03/22 23:58:27 $
*/
   
   
  @@ -308,12 +308,6 @@
   
   
   /**
  - * Is chunking allowed ?
  - */
  -private boolean allowChunking = true;
  -
  -
  -/**
* Use TCP no delay ?
*/
   private boolean tcpNoDelay = true;
  @@ -397,38 +391,6 @@
   public void setAcceptCount(int count) {
   
   this.acceptCount = count;
  -
  -}
  -
  -
  -/**
  - * Get the allow chunking flag.
  - */
  -public boolean isChunkingAllowed() {
  -
  -return (allowChunking);
  -
  -}
  -
  -
  -/**
  - * Get the allow chunking flag.
  - */
  -public boolean getAllowChunking() {
  -
  -return isChunkingAllowed();
  -
  -}
  -
  -
  -/**
  - * Set the allow chunking flag.
  - *
  - * @param allowChunking Allow chunking flag
  - */
  -public void setAllowChunking(boolean allowChunking) {
  -
  -this.allowChunking = allowChunking;
   
   }
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java

2002-03-14 Thread remm 

remm02/03/14 12:42:59

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java
  Log:
  - Rename uriNormalizationHack flag to uriValidationHack.
  
  Revision  ChangesPath
  1.4   +13 -13
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- CoyoteConnector.java  13 Mar 2002 07:42:11 -  1.3
  +++ CoyoteConnector.java  14 Mar 2002 20:42:59 -  1.4
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.3 2002/03/13 07:42:11 remm Exp $
  - * $Revision: 1.3 $
  - * $Date: 2002/03/13 07:42:11 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.4 2002/03/14 20:42:59 remm Exp $
  + * $Revision: 1.4 $
  + * $Date: 2002/03/14 20:42:59 $
*
* 
*
  @@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.3 $ $Date: 2002/03/13 07:42:11 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/14 20:42:59 $
*/
   
   
  @@ -327,9 +327,9 @@
   
   
   /**
  - * Use URI normalization.
  + * Use URI validation for Tomcat 4.0.x.
*/
  -private boolean useURINormalizationHack = true;
  +private boolean useURIValidationHack = true;
   
   
   // - Properties
  @@ -831,23 +831,23 @@
   
   
   /**
  - * Return the value of the Uri normalization flag.
  + * Return the value of the Uri validation flag.
*/
  -public boolean getUseURINormalizationHack() {
  +public boolean getUseURIValidationHack() {
   
  -return (this.useURINormalizationHack);
  +return (this.useURIValidationHack);
   
   }
   
   
   /**
  - * Set the value of the Uri normalization flag.
  + * Set the value of the Uri validation flag.
* 
  - * @param useURINormalizationHack The new flag value
  + * @param useURIValidationHack The new flag value
*/
  -public void setUseURINormalizationHack(boolean useURINormalizationHack) {
  +public void setUseURIValidationHack(boolean useURIValidationHack) {
   
  -this.useURINormalizationHack = useURINormalizationHack;
  +this.useURIValidationHack = useURIValidationHack;
   
   }
   
  
  
  

--
To unsubscribe, e-mail:   
For additional commands, e-mail:

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-03-12 Thread remm 

remm02/03/12 23:42:11

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteProcessor.java
  Log:
  - Add the URI normalization code from TC 4 used to protect against some URI
encoding based attacks. This may be useless in the HEAD branch after
the proposed URI decoding refactoring is done, so this code can be disabled.
It defaults to doing the checks, as some versions in the Tomcat 4.0.x branch
are very likely to need it.
  
  Revision  ChangesPath
  1.3   +32 -4 
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CoyoteConnector.java  27 Feb 2002 08:24:08 -  1.2
  +++ CoyoteConnector.java  13 Mar 2002 07:42:11 -  1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.2 2002/02/27 08:24:08 remm Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/02/27 08:24:08 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.3 2002/03/13 07:42:11 remm Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/03/13 07:42:11 $
*
* 
*
  @@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.2 $ $Date: 2002/02/27 08:24:08 $
  + * @version $Revision: 1.3 $ $Date: 2002/03/13 07:42:11 $
*/
   
   
  @@ -326,6 +326,12 @@
   "org.apache.coyote.http11.Http11Processor";
   
   
  +/**
  + * Use URI normalization.
  + */
  +private boolean useURINormalizationHack = true;
  +
  +
   // - Properties
   
   
  @@ -820,6 +826,28 @@
   public void setTcpNoDelay(boolean tcpNoDelay) {
   
   this.tcpNoDelay = tcpNoDelay;
  +
  +}
  +
  +
  +/**
  + * Return the value of the Uri normalization flag.
  + */
  +public boolean getUseURINormalizationHack() {
  +
  +return (this.useURINormalizationHack);
  +
  +}
  +
  +
  +/**
  + * Set the value of the Uri normalization flag.
  + * 
  + * @param useURINormalizationHack The new flag value
  + */
  +public void setUseURINormalizationHack(boolean useURINormalizationHack) {
  +
  +this.useURINormalizationHack = useURINormalizationHack;
   
   }
   
  
  
  
  1.12  +102 -7
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java
  
  Index: CoyoteProcessor.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- CoyoteProcessor.java  9 Mar 2002 17:40:01 -   1.11
  +++ CoyoteProcessor.java  13 Mar 2002 07:42:11 -  1.12
  @@ -1,6 +1,6 @@
  -/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
 1.11 2002/03/09 17:40:01 remm Exp $
  - * $Revision: 1.11 $
  - * $Date: 2002/03/09 17:40:01 $
  +/* * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteProcessor.java,v
 1.12 2002/03/13 07:42:11 remm Exp $
  + * $Revision: 1.12 $
  + * $Date: 2002/03/13 07:42:11 $
*
* 
*
  @@ -112,7 +112,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.11 $ $Date: 2002/03/09 17:40:01 $
  + * @version $Revision: 1.12 $ $Date: 2002/03/13 07:42:11 $
*/
   
   final class CoyoteProcessor
  @@ -301,7 +301,7 @@
   try {
   // Parse and set Catalina and configuration specific 
   // request parameters
  -postParseRequest(req);
  +postParseRequest(req, res);
   // Calling the container
   connector.getContainer().invoke(request, response);
   response.finishResponse();
  @@ -370,7 +370,7 @@
   /**
* Parse additional request parameters.
*/
  -protected void postParseRequest(Request req)
  +protected void postParseRequest(Request req, Response res)
   throws IOException {
   
   request.setSocket(socket);
  @@ -385,6 +385,17 @@
   else
   request.setServerPort(serverPort);
   
  +// Normalize URI is needed for security reasons on older versions 
  +// of Tom

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-03-01 Thread Remy Maucherat 

> On Thu, 28 Feb 2002, Remy Maucherat wrote:
>
> > The request is slightly different at the moment, but that's because I
don't
> > know what I need (so sorry, I'm not using your BaseRequest for the first
> > version). The Catalina adapter will be a full reimplementation of the
> > o.a.c.connector package (which has issues), and will use facaded
> > request/response objects.
> > So I'm doing the optimization work for you here.
>
> Thanks :-)
>
> The Catalina adapter in jk is refactored and optimized a bit in jk2,

Yes, I saw it. It's indeed better already.

> but I would be very happy to not have to spend time on this and I'm
> sure you'll do a much better implementation for 4.0 :-)

I'm not sure it will be that much better. I'll try to do some lazy
evaluations for everything.

> It would be nice to avoid too many layers/adapters, but for start
> it would be resonably easy to implement a JkHandler that delegates
> to your Request.

"My" request may evolve to be your request in the next version, so maybe not
much work at all will be needed. We'll see about that soon (hopefully).

> For now this is not a major issue, the current code seems ok, but
> in time it would be good to not duplicate the work, it's not
> that much fun to optimize the same thing too many times :-)

Yes.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-02-28 Thread Remy Maucherat 

> On Thu, 28 Feb 2002, GOMEZ Henri wrote:
>
> > Do you think coyote could be ever used with Tomcat 3.3 ?
> > ie: works with JDK 1.1, support TC 3.3 via modules
>
> Again: tomcat3.3 _doesn't_ require all modules to support
> JDK1.1 ! The only requirement is to have the basic
> functionality ( of a servlet container ) working on JDK1.1,
> and we already have that.
>
> There are quite a few optional modules in 3.3 that require
> 1.2 - sandbox, thread loader, etc. As long as the
> core is JDK1.1 compatible, things are going to be ok.

Anyway, it should be JDK 1.1 compliant.

> > JK/JK2 are available for both TC 3.3/4.x, it could be fine to
> > have also a common HTTP connector for them and coyote seems
> > to be the perfect candidate :)
>
> Well, we already have 4 HTTP/1.1 connectors for 3.3 :-)

I think he meant *JAVA* HTTP/1.1 connectors here.
:-)

> But I agree it would be good if Coyote would share more with
> jk - right now they use the low level stuff, but it would
> be trivial to integrate them a bit more and share the
> same connector ( the Request impl. - which will require
> quite a bit of work to optimize for 4.x ).

The request is slightly different at the moment, but that's because I don't
know what I need (so sorry, I'm not using your BaseRequest for the first
version). The Catalina adapter will be a full reimplementation of the
o.a.c.connector package (which has issues), and will use facaded
request/response objects.
So I'm doing the optimization work for you here.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-02-28 Thread Remy Maucherat 

Did I actually reply to this before ?
I can't remember, so in case I didn't ...

> Actually, I was hoping to find time to get started on this once 3.3.1 is
out
> the door (and hopefully things slow down a bit).
>
> I'm a bit behind on Remy's recent work, but I'm pretty sure that it
requires
> Java2.

No, I don't think so. The HTTP/1.1 stack should work with 1.1 (I can't find
any Java2 code in there).

Also, the HTTP stack is just the stack. It doesn't include the thread
pooling code, or the network handling code.
The Catalina adatpter, and the Catalina connector both require Java2, OTOH.

> Hi Remy,
>
> Do you think coyote could be ever used with Tomcat 3.3 ?
> ie: works with JDK 1.1, support TC 3.3 via modules

Since Coyote = more or less 1/2 of the Tomcat 3.3 core (according to
Costin's definition of the TC 3.3 core), it should be easier to adapt.

Note: I got complaints from Costin about the request and response objects.
Well, this is only the first version, and I had limited objectives (which
were: write a HTTP/1.1 stack on top of it + an adapter for TC 4, while
trying to keep things fairly generic). Coyote 2 can use different
request/response objects.

> JK/JK2 are available for both TC 3.3/4.x, it could be fine to
> have also a common HTTP connector for them and coyote seems
> to be the perfect candidate :)

I think the new HTTP stack is fast (but I don't have profiling data to back
this up at the moment). I'll do lots of profiling when the adapter for TC 4
is working.
It could be worthwhile to port JK 2 to Coyote (2 ?), since the TC 4 adapter
will likely be a lot faster than using the o.a.c.connector package. There's
obviously no hurry, as it's working fine already.

Remy


--
To unsubscribe, e-mail:   
For additional commands, e-mail:

Re: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-02-28 Thread Bill Barker 

Actually, I was hoping to find time to get started on this once 3.3.1 is out
the door (and hopefully things slow down a bit).

I'm a bit behind on Remy's recent work, but I'm pretty sure that it requires
Java2.
- Original Message -
From: "GOMEZ Henri" <[EMAIL PROTECTED]>
To: "Tomcat Developers List" <[EMAIL PROTECTED]>
Sent: Thursday, February 28, 2002 12:31 AM
Subject: RE: cvs commit:
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteProcessor.java


Hi Remy,

Do you think coyote could be ever used with Tomcat 3.3 ?
ie: works with JDK 1.1, support TC 3.3 via modules

JK/JK2 are available for both TC 3.3/4.x, it could be fine to
have also a common HTTP connector for them and coyote seems
to be the perfect candidate :)

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .)
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6





--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

RE: cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-02-28 Thread GOMEZ Henri 

Hi Remy,

Do you think coyote could be ever used with Tomcat 3.3 ?
ie: works with JDK 1.1, support TC 3.3 via modules 

JK/JK2 are available for both TC 3.3/4.x, it could be fine to
have also a common HTTP connector for them and coyote seems
to be the perfect candidate :)

-
Henri Gomez ___[_]
EMAIL : [EMAIL PROTECTED](. .) 
PGP KEY : 697ECEDD...oOOo..(_)..oOOo...
PGP Fingerprint : 9DF8 1EA8 ED53 2F39 DC9B 904A 364F 80E6 



>-Original Message-
>From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
>Sent: Wednesday, February 27, 2002 9:24 AM
>To: [EMAIL PROTECTED]
>Subject: cvs commit:
>jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4
>CoyoteConnector.java CoyoteProcessor.java
>
>
>remm02/02/27 00:24:08
>
>  Modified:coyote/src/java/org/apache/coyote/tomcat4
>CoyoteConnector.java CoyoteProcessor.java
>  Log:
>  - Code cleanup: remove old debug code for the thread pool, 
>use exclusively
>internationalized strings.
>  
>  Revision  ChangesPath
>  1.2   +62 -97
>jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tom
>cat4/CoyoteConnector.java
>  
>  Index: CoyoteConnector.java
>  ===
>  RCS file: 
>/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/
>coyote/tomcat4/CoyoteConnector.java,v
>  retrieving revision 1.1
>  retrieving revision 1.2
>  diff -u -r1.1 -r1.2
>  --- CoyoteConnector.java 17 Jan 2002 21:08:44 -  1.1
>  +++ CoyoteConnector.java 27 Feb 2002 08:24:08 -  1.2
>  @@ -1,7 +1,7 @@
>   /*
>  - * $Header: 
>/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/
>coyote/tomcat4/CoyoteConnector.java,v 1.1 2002/01/17 21:08:44 
>remm Exp $
>  - * $Revision: 1.1 $
>  - * $Date: 2002/01/17 21:08:44 $
>  + * $Header: 
>/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/
>coyote/tomcat4/CoyoteConnector.java,v 1.2 2002/02/27 08:24:08 
>remm Exp $
>  + * $Revision: 1.2 $
>  + * $Date: 2002/02/27 08:24:08 $
>*
>* 
>
>*
>  @@ -103,7 +103,7 @@
>*
>* @author Craig R. McClanahan
>* @author Remy Maucherat
>  - * @version $Revision: 1.1 $ $Date: 2002/01/17 21:08:44 $
>  + * @version $Revision: 1.2 $ $Date: 2002/02/27 08:24:08 $
>*/
>   
>   
>  @@ -326,12 +326,6 @@
>   "org.apache.coyote.http11.Http11Processor";
>   
>   
>  -/**
>  - * Coyote Processor class.
>  - */
>  -private Class processorClass = null;
>  -
>  -
>   // 
>- 
>Properties
>   
>   
>  @@ -839,11 +833,9 @@
>*/
>   public Request createRequest() {
>   
>  -//if (debug >= 2)
>  -//log("createRequest: Creating new request");
>   CoyoteRequest request = new CoyoteRequest();
>   request.setConnector(this);
>  -return null;//(request);
>  +return (request);
>   
>   }
>   
>  @@ -854,11 +846,9 @@
>*/
>   public Response createResponse() {
>   
>  -//if (debug >= 2)
>  -//log("createResponse: Creating new response");
>   CoyoteResponse response = new CoyoteResponse();
>   response.setConnector(this);
>  -return null;//(response);
>  +return (response);
>   
>   }
>   
>  @@ -873,8 +863,6 @@
>*/
>   void recycle(CoyoteProcessor processor) {
>   
>  -//if (debug >= 2)
>  -//log("recycle: Recycling processor " + 
>processor);
>   processors.push(processor);
>   
>   }
>  @@ -893,22 +881,14 @@
>   
>   synchronized (processors) {
>   if (processors.size() > 0) {
>  -// if (debug >= 2)
>  -// log("createProcessor: Reusing existing 
>processor");
>   return ((CoyoteProcessor) processors.pop());
>   }
>   if ((maxProcessors > 0) && (curProcessors < 
>maxProcessors)) {
>  -// if (debug >= 2)
>  -// log("createProcessor: Creating new processor");
>   return (newProcessor());
>   } else {
>   if (maxProcessors < 0) {
>  -// if (debug >= 2)
>  -// log("createProcessor: Creating new 
>processor");
>

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java

2002-02-27 Thread remm 

remm02/02/27 00:24:08

  Modified:coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteProcessor.java
  Log:
  - Code cleanup: remove old debug code for the thread pool, use exclusively
internationalized strings.
  
  Revision  ChangesPath
  1.2   +62 -97
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- CoyoteConnector.java  17 Jan 2002 21:08:44 -  1.1
  +++ CoyoteConnector.java  27 Feb 2002 08:24:08 -  1.2
  @@ -1,7 +1,7 @@
   /*
  - * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.1 2002/01/17 21:08:44 remm Exp $
  - * $Revision: 1.1 $
  - * $Date: 2002/01/17 21:08:44 $
  + * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.2 2002/02/27 08:24:08 remm Exp $
  + * $Revision: 1.2 $
  + * $Date: 2002/02/27 08:24:08 $
*
* 
*
  @@ -103,7 +103,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
  - * @version $Revision: 1.1 $ $Date: 2002/01/17 21:08:44 $
  + * @version $Revision: 1.2 $ $Date: 2002/02/27 08:24:08 $
*/
   
   
  @@ -326,12 +326,6 @@
   "org.apache.coyote.http11.Http11Processor";
   
   
  -/**
  - * Coyote Processor class.
  - */
  -private Class processorClass = null;
  -
  -
   // - Properties
   
   
  @@ -839,11 +833,9 @@
*/
   public Request createRequest() {
   
  -//if (debug >= 2)
  -//log("createRequest: Creating new request");
   CoyoteRequest request = new CoyoteRequest();
   request.setConnector(this);
  -return null;//(request);
  +return (request);
   
   }
   
  @@ -854,11 +846,9 @@
*/
   public Response createResponse() {
   
  -//if (debug >= 2)
  -//log("createResponse: Creating new response");
   CoyoteResponse response = new CoyoteResponse();
   response.setConnector(this);
  -return null;//(response);
  +return (response);
   
   }
   
  @@ -873,8 +863,6 @@
*/
   void recycle(CoyoteProcessor processor) {
   
  -//if (debug >= 2)
  -//log("recycle: Recycling processor " + processor);
   processors.push(processor);
   
   }
  @@ -893,22 +881,14 @@
   
   synchronized (processors) {
   if (processors.size() > 0) {
  -// if (debug >= 2)
  -// log("createProcessor: Reusing existing processor");
   return ((CoyoteProcessor) processors.pop());
   }
   if ((maxProcessors > 0) && (curProcessors < maxProcessors)) {
  -// if (debug >= 2)
  -// log("createProcessor: Creating new processor");
   return (newProcessor());
   } else {
   if (maxProcessors < 0) {
  -// if (debug >= 2)
  -// log("createProcessor: Creating new processor");
   return (newProcessor());
   } else {
  -// if (debug >= 2)
  -// log("createProcessor: Cannot create new processor");
   return (null);
   }
   }
  @@ -964,14 +944,12 @@
*/
   private CoyoteProcessor newProcessor() {
   
  -//if (debug >= 2)
  -//log("newProcessor: Creating new processor");
   CoyoteProcessor processor = new CoyoteProcessor(this, curProcessors++);
   if (processor instanceof Lifecycle) {
   try {
   ((Lifecycle) processor).start();
   } catch (LifecycleException e) {
  -log("newProcessor", e);
  +log(sm.getString("coyoteConnector.newProcessor"), e);
   return (null);
   }
   }
  @@ -991,14 +969,15 @@
*   KeyStore from file (SSL only)
* @exception NoSuchAlgorithmException   KeyStore algorithm unsupported
*   by current provider (SSL only)
  - * @exception CertificateException   general certificate error (SSL only)
  + * @exception CertificateException   general certificate error 
  + *   (SSL only)
* @exception Unrecoverable

cvs commit: jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4 CoyoteConnector.java CoyoteProcessor.java CoyoteRequest.java CoyoteResponse.java Constants.java

2002-01-17 Thread remm 

remm02/01/17 13:08:44

  Modified:coyote/src/java/org/apache/coyote/tomcat4 Constants.java
  Added:   coyote/src/java/org/apache/coyote/tomcat4
CoyoteConnector.java CoyoteProcessor.java
CoyoteRequest.java CoyoteResponse.java
  Log:
  - Add a skeleton of the Coyote connector for TC 4.
  
  Revision  ChangesPath
  1.2   +6 -0  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/Constants.java
  
  Index: Constants.java
  ===
  RCS file: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/Constants.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Constants.java4 Dec 2001 20:27:11 -   1.1
  +++ Constants.java17 Jan 2002 21:08:44 -  1.2
  @@ -71,4 +71,10 @@
   // -- Constants
   
   
  +public static final String Package = "org.apache.coyote.tomcat4";
  +public static final int DEFAULT_CONNECTION_TIMEOUT = 6;
  +
  +public static final int PROCESSOR_IDLE = 0;
  +public static final int PROCESSOR_ACTIVE = 1;
  +
   }
  
  
  
  1.1  
jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java
  
  Index: CoyoteConnector.java
  ===
  /*
   * $Header: 
/home/cvs/jakarta-tomcat-connectors/coyote/src/java/org/apache/coyote/tomcat4/CoyoteConnector.java,v
 1.1 2002/01/17 21:08:44 remm Exp $
   * $Revision: 1.1 $
   * $Date: 2002/01/17 21:08:44 $
   *
   * 
   *
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 1999 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *notice, this list of conditions and the following disclaimer in
   *the documentation and/or other materials provided with the
   *distribution.
   *
   * 3. The end-user documentation included with the redistribution, if
   *any, must include the following acknowlegement:
   *   "This product includes software developed by the
   *Apache Software Foundation (http://www.apache.org/)."
   *Alternately, this acknowlegement may appear in the software itself,
   *if and wherever such third-party acknowlegements normally appear.
   *
   * 4. The names "The Jakarta Project", "Tomcat", and "Apache Software
   *Foundation" must not be used to endorse or promote products derived
   *from this software without prior written permission. For written
   *permission, please contact [EMAIL PROTECTED]
   *
   * 5. Products derived from this software may not be called "Apache"
   *nor may "Apache" appear in their names without prior written
   *permission of the Apache Group.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * 
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * .
   *
   * [Additional notices, if required by prior licensing conditions]
   *
   */
  
  
  package org.apache.coyote.tomcat4;
  
  
  import java.io.IOException;
  import java.net.InetAddress;
  import java.net.ServerSocket;
  import java.net.Socket;
  import java.net.UnknownHostException;
  import java.security.AccessControlException;
  import java.util.Stack;
  import java.util.Vector;
  import java.util.Enumeration;
  import java.security.KeyStoreException;
  import java.security.NoSuchAlgorithmException;
  import java.security.cert.Certificat