svn commit: r451157 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ coyote/ajp/ coyote/http11/ tomcat/util/net/

[mturk]

Author: mturk
Date: Fri Sep 29 01:23:37 2006
New Revision: 451157

URL: http://svn.apache.org/viewvc?view=rev&rev=451157
Log:
Introduce keepAliveTimeout to be able to separate
the Keep-Alive and Socket timeout.
The patch enables to have infinite socket timeouts
while still having correct keep alive.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java?view=diff&rev=451157&r1=451156&r2=451157
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java Fri 
Sep 29 01:23:37 2006
@@ -34,6 +34,7 @@
 public static final int DEFAULT_CONNECTION_TIMEOUT = 6;
 public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 30;
 public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
+public static final int DEFAULT_KEEPALIVE_TIMEOUT = 15000;
 
 public static final int PROCESSOR_IDLE = 0;
 public static final int PROCESSOR_ACTIVE = 1;

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?view=diff&rev=451157&r1=451156&r2=451157
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
Fri Sep 29 01:23:37 2006
@@ -93,6 +93,10 @@
   description="Maximum number of Keep-Alive requests to honor per 
connection"
  type="int"/>
 
+
+
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?view=diff&rev=451157&r1=451156&r2=451157
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri Sep 
29 01:23:37 2006
@@ -417,6 +417,15 @@
 setAttribute("soTimeout", "" + i);
 }
 
+public int getKeepAliveTimeout() {
+return ep.getKeepAliveTimeout();
+}
+
+
+public void setKeepAliveTimeout( int i ) {
+ep.setKeepAliveTimeout(i);
+setAttribute("keepAliveTimeout", "" + i);
+}
 
 public void setRequiredSecret(String requiredSecret) {
 this.requiredSecret = requiredSecret;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java?view=diff&rev=451157&r1=451156&r2=451157
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java Fri Sep 29 
01:23:37 2006
@@ -38,6 +38,7 @@
 public static final int DEFAULT_CONNECTION_LINGER = -1;
 public static final int DEFAULT_CONNECTION_TIMEOUT = -1;
 public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 30;
+public static final int DEFAULT_KEEPALIVE_TIMEOUT = 15000;
 public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
 public static final boolean DEFAULT_TCP_NO_DELAY = true;
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java?view=diff&rev=451157&r1=451156&r2=451157
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java Fri Sep 
29 01:23:37 2006
@@ -39,6 +39,7 @@
 public static final int DEFAULT_CONNECTION_TIMEOUT = 6;
 public static final int DEFA

Re: svn commit: r451157 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ coyote/ajp/ coyote/http11/ tomcat/util/net/

[Remy Maucherat]

[EMAIL PROTECTED] wrote:

Author: mturk
Date: Fri Sep 29 01:23:37 2006
New Revision: 451157

URL: http://svn.apache.org/viewvc?view=rev&rev=451157
Log:
Introduce keepAliveTimeout to be able to separate
the Keep-Alive and Socket timeout.
The patch enables to have infinite socket timeouts
while still having correct keep alive.


As I said before, I see no point in that.

Rémy

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

svn commit: r451198 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

[remm]

Author: remm
Date: Fri Sep 29 02:38:35 2006
New Revision: 451198

URL: http://svn.apache.org/viewvc?view=rev&rev=451198
Log:
- Also watch conf/web.xml.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=451198&r1=451197&r2=451198
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Fri Sep 29 02:38:35 2006
@@ -616,6 +616,7 @@
 source =
 new InputSource("file://" + file.getAbsolutePath());
 stream = new FileInputStream(file);
+context.addWatchedResource(file.getAbsolutePath());
 }
 } catch (Exception e) {
 log.error(sm.getString("contextConfig.defaultMissing") 



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

svn commit: r451202 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ coyote/ajp/ coyote/http11/ tomcat/util/net/

[remm]

Author: remm
Date: Fri Sep 29 02:42:56 2006
New Revision: 451202

URL: http://svn.apache.org/viewvc?view=rev&rev=451202
Log:
- The addition of keepAliveTimeout is useless for the regular connector, as it 
already has two different timeouts as an
  option.
- Make it default to soTimeout in the other cases.
- Sendfile should not use keepAliveTimeout, but soTimeout.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java?view=diff&rev=451202&r1=451201&r2=451202
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/Constants.java Fri 
Sep 29 02:42:56 2006
@@ -34,7 +34,6 @@
 public static final int DEFAULT_CONNECTION_TIMEOUT = 6;
 public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 30;
 public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
-public static final int DEFAULT_KEEPALIVE_TIMEOUT = 15000;
 
 public static final int PROCESSOR_IDLE = 0;
 public static final int PROCESSOR_ACTIVE = 1;

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?view=diff&rev=451202&r1=451201&r2=451202
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri Sep 
29 02:42:56 2006
@@ -68,6 +68,7 @@
 cHandler = new AjpConnectionHandler(this);
 setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
 setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
+setKeepAliveTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
 //setServerSoTimeout(Constants.DEFAULT_SERVER_SOCKET_TIMEOUT);
 setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
 }

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java?view=diff&rev=451202&r1=451201&r2=451202
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/Constants.java Fri Sep 29 
02:42:56 2006
@@ -38,7 +38,6 @@
 public static final int DEFAULT_CONNECTION_LINGER = -1;
 public static final int DEFAULT_CONNECTION_TIMEOUT = -1;
 public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 30;
-public static final int DEFAULT_KEEPALIVE_TIMEOUT = 15000;
 public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
 public static final boolean DEFAULT_TCP_NO_DELAY = true;
 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java?view=diff&rev=451202&r1=451201&r2=451202
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java (original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Constants.java Fri Sep 
29 02:42:56 2006
@@ -39,7 +39,6 @@
 public static final int DEFAULT_CONNECTION_TIMEOUT = 6;
 public static final int DEFAULT_CONNECTION_UPLOAD_TIMEOUT = 30;
 public static final int DEFAULT_SERVER_SOCKET_TIMEOUT = 0;
-public static final int DEFAULT_KEEPALIVE_TIMEOUT = 15000;
 public static final boolean DEFAULT_TCP_NO_DELAY = true;
 
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?view=diff&rev=451202&r1=451201&r2=451202
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
Fri

Quick question - JSP2.1/Servlet2.5 support in tomcat?

[Kevin Jackson]

Hi all,

Sorry to just drop in with this question, but I couldn't find anything
related @ MARC so I thought the dev list would be the place to ask

What is the current status of tomcat with respect to JSP2.1 spec
(specifically the unified expression language feature)?

Also any area of the code a n00b could get involved in/help out with?

Kev
([EMAIL PROTECTED] - yeah I'm a n00b here, but I'm involved in other
apache stuff, so don't worry about the contributor license requirement
;) )

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

svn commit: r451207 - in /tomcat/tc6.0.x/trunk/java/org/apache: coyote/http11/Http11AprProtocol.java tomcat/util/net/AprEndpoint.java

[remm]

Author: remm
Date: Fri Sep 29 02:57:41 2006
New Revision: 451207

URL: http://svn.apache.org/viewvc?view=rev&rev=451207
Log:
- The keep alive value is actually in the endpoint.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?view=diff&rev=451207&r1=451206&r2=451207
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
Fri Sep 29 02:57:41 2006
@@ -202,7 +202,6 @@
 private int socketBuffer = 9000;
 private Adapter adapter;
 private Http11ConnectionHandler cHandler;
-private int keepAliveTimeout = 15000; // 15 seconds as in Apache HTTPD 
server
 
 /**
  * Compression value.
@@ -469,8 +468,13 @@
  * before closing the connection. The default is the same as for
  * Apache HTTP Server (15 000 milliseconds).
  */
-public int getKeepAliveTimeout() { return keepAliveTimeout; }
-public void setKeepAliveTimeout(int timeout) { keepAliveTimeout = timeout; 
}
+public int getKeepAliveTimeout() {
+return ep.getKeepAliveTimeout();
+}
+
+public void setKeepAliveTimeout(int timeout) {
+ep.setKeepAliveTimeout(timeout);
+}
 
 /**
  * Return the Keep-Alive policy for the connection.

Modified: tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?view=diff&rev=451207&r1=451206&r2=451207
==
--- tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Fri 
Sep 29 02:57:41 2006
@@ -255,6 +255,7 @@
 public int getSoTimeout() { return soTimeout; }
 public void setSoTimeout(int soTimeout) { this.soTimeout = soTimeout; }
 
+
 /**
  * Keep-Alive timeout.
  */



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

Re: Quick question - JSP2.1/Servlet2.5 support in tomcat?

[Remy Maucherat]

Kevin Jackson wrote:

What is the current status of tomcat with respect to JSP2.1 spec
(specifically the unified expression language feature)?


The SVN repository is here:
http://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk/


Also any area of the code a n00b could get involved in/help out with?


You could start by looking at it.

Rémy

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

Re: [6.0] Updates

[Remy Maucherat]

Costin Manolache wrote:

IMO both clustering implementations should be provided as separate
downloads.

No need to put them in sandbox ( since they were released in the past, it's
'proven' code ).
Not sure if they should be in separate repos or it's ok to have both of 
them

in the main tree.


Wow, this is harsh ;)

I'll maintain my position (since people hate me enough already):
- the code is proven enough so that a clustering impl remains bundled 
(given it's been force fed in 5.5)
- it's not a good idea to remove features that were included in a 
previous version
- only one implementation bundled, however; I favor the new one right 
now, as Filip claims it's merely a cleanup and an evolution of the old 
one, and nobody has shown yet it was hopelessly broken
- it's rather small, so it's ok (at 300k, it's far smaller than the 
admin webapp), esp since people could also use it in their apps


I think I prefer keeping a little more code in the core repository which 
would otherwise be absolutely needed. It doesn't hurt, and it makes 
people happy.


Rémy

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

svn commit: r451231 - /tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java

[remm]

Author: remm
Date: Fri Sep 29 04:09:42 2006
New Revision: 451231

URL: http://svn.apache.org/viewvc?view=rev&rev=451231
Log:
- Try/catch around the clear buffer, as if the writer was closed the original 
exception will not be displayed.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?view=diff&rev=451231&r1=451230&r2=451231
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Fri Sep 
29 04:09:42 2006
@@ -3276,7 +3276,7 @@
 out.printil("out = _jspx_out;");
 out.printil("if (out != null && out.getBufferSize() != 0)");
 out.pushIndent();
-out.printil("out.clearBuffer();");
+out.printil("try { out.clearBuffer(); } catch (java.io.IOException e) 
{}");
 out.popIndent();
 
 out



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

Re: svn commit: r451157 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ coyote/ajp/ coyote/http11/ tomcat/util/net/

[Filip Hanik - Dev Lists]

Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:

Author: mturk
Date: Fri Sep 29 01:23:37 2006
New Revision: 451157

URL: http://svn.apache.org/viewvc?view=rev&rev=451157
Log:
Introduce keepAliveTimeout to be able to separate
the Keep-Alive and Socket timeout.
The patch enables to have infinite socket timeouts
while still having correct keep alive.


As I said before, I see no point in that.
maybe I'm being dumb here, so please enlighten me, but how are they 
(keepalivetimeout vs connection timeout) different on a HTTP connection?


wouldn't the smallest of these two values always close the connection?
connection timeout on HTTP is after all only measured when the worker 
thread is not using the connection. on java.io, it would be on a read() 
from the input stream, and on APR and NIO it would be time spent in the 
poller or a read()


Filip



Rémy

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





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

RE: ANN] Apache Tomcat v5.5.20 Now Available

[Warren Lewis]

Hi,

 The changelog still points to Tomcat 5.5.17.

cheers - Warren 

-Original Message-
From: Filip Hanik - Dev Lists [mailto:[EMAIL PROTECTED] 
Sent: Thursday, September 28, 2006 11:57 AM
To: Tomcat Developers List; Tomcat Users List; announce@apache.org
Subject: ANN] Apache Tomcat v5.5.20 Now Available

The Apache Tomcat team is pleased to announce the immediate availability of 
version 5.5.20 of the Apache Tomcat server.

This release contains dozens of important bug fixes and improvements to the 
Tomcat server.

Release Notes: http://tomcat.apache.org/tomcat-5.5-doc/RELEASE-NOTES

Change Log: http://tomcat.apache.org/tomcat-5.5-doc/changelog.html

Downloads: http://tomcat.apache.org/download-55.cgi

The mirrors are currently updating their content with this latest stable 
release. Please be patient if the mirror you are accessing has not yet been 
updated.

For previous releases of Tomcat, please visit 
http://archive.apache.org/dist/tomcat/tomcat-5/

Thank you,

-- The Apache Tomcat Team




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

Re: svn commit: r451157 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ coyote/ajp/ coyote/http11/ tomcat/util/net/

[Remy Maucherat]

Filip Hanik - Dev Lists wrote:

Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:

Author: mturk
Date: Fri Sep 29 01:23:37 2006
New Revision: 451157

URL: http://svn.apache.org/viewvc?view=rev&rev=451157
Log:
Introduce keepAliveTimeout to be able to separate
the Keep-Alive and Socket timeout.
The patch enables to have infinite socket timeouts
while still having correct keep alive.


As I said before, I see no point in that.
maybe I'm being dumb here, so please enlighten me, but how are they 
(keepalivetimeout vs connection timeout) different on a HTTP connection?


wouldn't the smallest of these two values always close the connection?
connection timeout on HTTP is after all only measured when the worker 
thread is not using the connection. on java.io, it would be on a read() 
from the input stream, and on APR and NIO it would be time spent in the 
poller or a read()


From what I understand, keepAliveTimeout is supposed to be the timeout 
when doing HTTP keepalive (= keepalive between requests) while the other 
one is supposed to be the timeout while processing requests (= time 
spent blocking on a read when processing a PUT or POST). Since there's 
already the disableUploadTimeout flag (which inflates the timeout while 
requests are being processed), I could not find any actual benefit with 
this change.


Rémy

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

Re: svn commit: r451157 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ coyote/ajp/ coyote/http11/ tomcat/util/net/

[Filip Hanik - Dev Lists]

Remy Maucherat wrote:

Filip Hanik - Dev Lists wrote:

Remy Maucherat wrote:

[EMAIL PROTECTED] wrote:

Author: mturk
Date: Fri Sep 29 01:23:37 2006
New Revision: 451157

URL: http://svn.apache.org/viewvc?view=rev&rev=451157
Log:
Introduce keepAliveTimeout to be able to separate
the Keep-Alive and Socket timeout.
The patch enables to have infinite socket timeouts
while still having correct keep alive.


As I said before, I see no point in that.
maybe I'm being dumb here, so please enlighten me, but how are they 
(keepalivetimeout vs connection timeout) different on a HTTP connection?


wouldn't the smallest of these two values always close the connection?
connection timeout on HTTP is after all only measured when the worker 
thread is not using the connection. on java.io, it would be on a 
read() from the input stream, and on APR and NIO it would be time 
spent in the poller or a read()


From what I understand, keepAliveTimeout is supposed to be the timeout 
when doing HTTP keepalive (= keepalive between requests) while the 
other one is supposed to be the timeout while processing requests (= 
time spent blocking on a read when processing a PUT or POST). Since 
there's already the disableUploadTimeout flag (which inflates the 
timeout while requests are being processed), I could not find any 
actual benefit with this change.
:) yeah, and with comet, the keep alive shouldn't be applied ever if 
that is the scenario, so inside the poll timeout checking it needs to 
make that distinction.
I think I'll leave this out of the NIO unless you think we should have 
it there.


Filip

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

Re: [6.0] Updates

[Filip Hanik - Dev Lists]

Remy Maucherat wrote:

Costin Manolache wrote:

IMO both clustering implementations should be provided as separate
downloads.

No need to put them in sandbox ( since they were released in the 
past, it's

'proven' code ).
Not sure if they should be in separate repos or it's ok to have both 
of them

in the main tree.


looks like the question of old vs new impl is turning into module or no 
module, so I'll try to very briefly address both of them.


1. old vs new
Yes, the new one is an evolution of the old one, and not even the entire 
implementation, simply the IO layer, which is now much cleaner, easier 
to maintain, and not turn into the old spaghetti that I wrote with the 
old impl :)
the o.a.catalina.ha package is the same as the replication logic from 
the old package.
so why not the old package, the answer is easy. We are already short on 
committers and committer activity, with such a small group, I believe 
everyone will benefit if the focus is smaller.


2. module or no module, repo or no repo
with the tomcat-light being built, there is no reason why tomcat 
shouldn't contain 300k extra to easily enable clustering. so far we 
haven't seen any donations or suggestions that anyone else is gonna 
bring in a different module, so I do believe its better the way it is 
setup today.

Wow, this is harsh ;)

I'll maintain my position (since people hate me enough already):
- the code is proven enough so that a clustering impl remains bundled 
(given it's been force fed in 5.5)
- it's not a good idea to remove features that were included in a 
previous version
- only one implementation bundled, however; I favor the new one right 
now, as Filip claims it's merely a cleanup and an evolution of the old 
one, and nobody has shown yet it was hopelessly broken
- it's rather small, so it's ok (at 300k, it's far smaller than the 
admin webapp), esp since people could also use it in their apps


I think I prefer keeping a little more code in the core repository 
which would otherwise be absolutely needed. It doesn't hurt, and it 
makes people happy.
yes, easier to maintain, and I believe that was the main goal of the TC6 
source consolidation.


Filip

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

ApacheCon US - Austin

[Filip Hanik - Dev Lists]

is anyone from this group gonna attend?

Austin is only 3hours from where I live so I will be there the whole 
week (Mon-Fri)


I think it would be neat to get together, maybe during the hackathon or 
just for a drink in the bar and b.s. a little.


Filip

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

svn commit: r451318 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/connector/ catalina/startup/ coyote/ajp/ coyote/http11/ jasper/compiler/ tomcat/util/net/

[mturk]

Author: mturk
Date: Fri Sep 29 07:58:32 2006
New Revision: 451318

URL: http://svn.apache.org/viewvc?view=rev&rev=451318
Log:
Revert Keep-Alive patch.

Modified:

tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Processor.java
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11Protocol.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml?view=diff&rev=451318&r1=451317&r2=451318
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
(original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/connector/mbeans-descriptors.xml 
Fri Sep 29 07:58:32 2006
@@ -93,10 +93,6 @@
   description="Maximum number of Keep-Alive requests to honor per 
connection"
  type="int"/>
 
-
-
 

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=451318&r1=451317&r2=451318
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Fri Sep 29 07:58:32 2006
@@ -616,7 +616,6 @@
 source =
 new InputSource("file://" + file.getAbsolutePath());
 stream = new FileInputStream(file);
-context.addWatchedResource(file.getAbsolutePath());
 }
 } catch (Exception e) {
 log.error(sm.getString("contextConfig.defaultMissing") 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java?view=diff&rev=451318&r1=451317&r2=451318
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/ajp/AjpAprProtocol.java Fri Sep 
29 07:58:32 2006
@@ -68,7 +68,6 @@
 cHandler = new AjpConnectionHandler(this);
 setSoLinger(Constants.DEFAULT_CONNECTION_LINGER);
 setSoTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
-setKeepAliveTimeout(Constants.DEFAULT_CONNECTION_TIMEOUT);
 //setServerSoTimeout(Constants.DEFAULT_SERVER_SOCKET_TIMEOUT);
 setTcpNoDelay(Constants.DEFAULT_TCP_NO_DELAY);
 }
@@ -418,15 +417,6 @@
 setAttribute("soTimeout", "" + i);
 }
 
-public int getKeepAliveTimeout() {
-return ep.getKeepAliveTimeout();
-}
-
-
-public void setKeepAliveTimeout( int i ) {
-ep.setKeepAliveTimeout(i);
-setAttribute("keepAliveTimeout", "" + i);
-}
 
 public void setRequiredSecret(String requiredSecret) {
 this.requiredSecret = requiredSecret;

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java?view=diff&rev=451318&r1=451317&r2=451318
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProcessor.java 
Fri Sep 29 07:58:32 2006
@@ -208,6 +208,7 @@
  */
 protected int maxKeepAliveRequests = -1;
 
+
 /**
  * SSL enabled ?
  */
@@ -641,6 +642,7 @@
 public int getMaxKeepAliveRequests() {
 return maxKeepAliveRequests;
 }
+
 
 /**
  * Set the maximum size of a POST which will be buffered in SSL mode.

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java?view=diff&rev=451318&r1=451317&r2=451318
==
--- tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProtocol.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/Http11AprProt

Re: ApacheCon US - Austin

[Yoav Shapira]

I'd love to, but I'm not going to be there unfortunately ;(  Just came
back from vacation, can't take another...

Yoav

On 9/29/06, Filip Hanik - Dev Lists <[EMAIL PROTECTED]> wrote:

is anyone from this group gonna attend?

Austin is only 3hours from where I live so I will be there the whole
week (Mon-Fri)

I think it would be neat to get together, maybe during the hackathon or
just for a drink in the bar and b.s. a little.

Filip

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




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

Tomcat keepAliveTimeout

[Mladen Turk]

Hi,

The problem is that we presume that socket timeout
is keep-alive timeout, and that is wrong.
The reason is simple because the time between two
requests has noting to do with the the time the data
will be read.

Also, the thing like reading the request is dependent
on the number of client connections!!! (very stupid)
It means that the user and admin could not be sure
what the actual timeout is.

int threadRatio = (endpoint.getCurrentThreadsBusy() * 100)
/ endpoint.getMaxThreads();
if ((threadRatio > 33) && (threadRatio <= 66)) {
soTimeout = soTimeout / 2;
} else if ((threadRatio > 66) && (threadRatio <= 90)) {
soTimeout = soTimeout / 3;
keepAliveLeft = 1;
} else if (threadRatio > 90) {
soTimeout = soTimeout / 20;
keepAliveLeft = 1;
}

It means that the timeout for the request can be
soTimeout, soTimeout/2 or soTimeout/20 !
Now, how can one deduct what the timeout is.

The code was probably made to deal with the high load.
But, what If I know what my load will be, and I'm sure
it'll never go over the maxThreads?
It would mean that half of my connections will have 10sec
timout, one third will have 3 secs, and the 10 percent of them
will have 0 sec timeout.
Now that sucks major!

Comments?

--
Mladen.






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

Re: Tomcat keepAliveTimeout

[Filip Hanik - Dev Lists]

you are correct, soTimeout should not, imho, change depending on the 
thread count.

if the user sets 20 seconds for soTimeout then it should stay that way.

on blocking io, soTimeout naturally becomes keepAliveTimeout, as when 
the request is complete, you go into read() again.
on non blocking io this is different, but here we use the same timeout 
during the polling stage and timeout the connections that way.


I see how soTimeout would be different from keepAlivetimeout when the 
servlet is invoking a blocking read on the servletinputstream.
in that case they might want a keepalivetimeout to be fairly long, maybe 
15 seconds, and soTimeout to be short, like less than 1 second.
but this scenario becomes tricky, if you timeout on a servletinputstream 
read, is that an exception that the servlet should catch, and does it 
mean that the request is complete, or should the servlet attempt the 
read again?
I think we would have to identify the behavior here before we implement 
the change, that way we can have a consistent implementation across all 
connectors


Filip



Mladen Turk wrote:

Hi,

The problem is that we presume that socket timeout
is keep-alive timeout, and that is wrong.
The reason is simple because the time between two
requests has noting to do with the the time the data
will be read.

Also, the thing like reading the request is dependent
on the number of client connections!!! (very stupid)
It means that the user and admin could not be sure
what the actual timeout is., imho

int threadRatio = (endpoint.getCurrentThreadsBusy() * 100)
/ endpoint.getMaxThreads();
if ((threadRatio > 33) && (threadRatio <= 66)) {
soTimeout = soTimeout / 2;
} else if ((threadRatio > 66) && (threadRatio <= 90)) {
soTimeout = soTimeout / 3;
keepAliveLeft = 1;
} else if (threadRatio > 90) {
soTimeout = soTimeout / 20;
keepAliveLeft = 1;
}

It means that the timeout for the request can be
soTimeout, soTimeout/2 or soTimeout/20 !
Now, how can one deduct what the timeout is.

The code was probably made to deal with the high load.
But, what If I know what my load will be, and I'm sure
it'll never go over the maxThreads?
It would mean that half of my connections will have 10sec
timout, one third will have 3 secs, and the 10 percent of them
will have 0 sec timeout.
Now that sucks major!

Comments?

--
Mladen.






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





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

svn commit: r451339 - /tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java

[fhanik]

Author: fhanik
Date: Fri Sep 29 09:21:26 2006
New Revision: 451339

URL: http://svn.apache.org/viewvc?view=rev&rev=451339
Log:
increased tolerance on the test

Modified:

tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java

Modified: 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java?view=diff&rev=451339&r1=451338&r2=451339
==
--- 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/test/org/apache/catalina/tribes/test/channel/TestDataIntegrity.java
 Fri Sep 29 09:21:26 2006
@@ -69,7 +69,7 @@
 for (int x=0; x

Re: [6.0] Updates

[Costin Manolache]

On 9/29/06, Remy Maucherat <[EMAIL PROTECTED]> wrote:


Costin Manolache wrote:
> IMO both clustering implementations should be provided as separate
> downloads.
>
> No need to put them in sandbox ( since they were released in the past,
it's
> 'proven' code ).
> Not sure if they should be in separate repos or it's ok to have both of
> them
> in the main tree.

Wow, this is harsh ;)

I'll maintain my position (since people hate me enough already):
- the code is proven enough so that a clustering impl remains bundled
(given it's been force fed in 5.5)



There is no question about this - that's why it can stay in the main tree,
it is stable code.

And I agree with you that it's better to choose one.


- it's not a good idea to remove features that were included in a

previous version



That's where I'm not sure I agree. We don't 'remove' a feature - we just
make it
available in a different package.  And 6.0 is the right place to make such
changes.
Nothing personal against clustering - but we need to start with something.



- only one implementation bundled, however; I favor the new one right

now, as Filip claims it's merely a cleanup and an evolution of the old
one, and nobody has shown yet it was hopelessly broken
- it's rather small, so it's ok (at 300k, it's far smaller than the
admin webapp), esp since people could also use it in their apps



Yes, the admin webapp should be a separate download as well :-)

The argument that people could use it doesn't hold - people use C++ or HTML
editors, but
it's not bundled in the core eclipse distro. Or they use LiveHeaders and
Greasemonkey, but
it's not in default firefox, neither the mail reader or html editors :-)

I think I prefer keeping a little more code in the core repository which

would otherwise be absolutely needed. It doesn't hurt, and it makes
people happy.



Sure - in repository we can keep all the code, but that doesn't mean we
should have big
monolithic releases.

We already had multiple downloads - we can even do 'tomcat complete' ( i.e.
tomcat
bundled with all features ) and 'tomcat essentials'  + individual modules.

Treating features as modules can be good for everyone.



Costin


Rémy


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

Re: Tomcat keepAliveTimeout

[Mladen Turk]

Filip Hanik - Dev Lists wrote:
you are correct, soTimeout should not, imho, change depending on the 
thread count.

if the user sets 20 seconds for soTimeout then it should stay that way.



Right. With the current code you can only deduct what the actual
timeout will be. Like said, for 40 sec timeout it can be
40, 20, 13 or 2.



I see how soTimeout would be different from keepAlivetimeout when the 
servlet is invoking a blocking read on the servletinputstream.


Actually its very simple:
soTimeout: The time to read the data.
keepAliveTimeout: The time between two requests.

Those things has been elaborated long time ago.
I'm sad that my first patch to the Tomcat get reverted immediately
without any -1. Anyhow, I'll think twice before next commit.

Regards,
Mladen.

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

svn commit: r451343 - in /tomcat/tc6.0.x/trunk: conf/ java/org/apache/catalina/ java/org/apache/catalina/core/ java/org/apache/catalina/ha/ java/org/apache/catalina/ha/session/ java/org/apache/catalin

[fhanik]

Author: fhanik
Date: Fri Sep 29 09:32:32 2006
New Revision: 451343

URL: http://svn.apache.org/viewvc?view=rev&rev=451343
Log:
Update configurations options, this new feature allows a specific  to 
overwrite what cluster manager is used by specifying a  element inside 
the context element and the cluster will be notified of it.
This allows for a cleaner config, as the cluster does no longer have to forward 
all manager settings, and allows documentation to be much clearer on what 
settings are available.


Modified:
tomcat/tc6.0.x/trunk/conf/server.xml
tomcat/tc6.0.x/trunk/java/org/apache/catalina/Cluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/StandardContext.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/ClusterRuleSet.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/BackupManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/DeltaManager.java

tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/session/SimpleTcpReplicationManager.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc6.0.x/trunk/java/org/apache/catalina/tribes/MembershipListener.java

Modified: tomcat/tc6.0.x/trunk/conf/server.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/conf/server.xml?view=diff&rev=451343&r1=451342&r2=451343
==
--- tomcat/tc6.0.x/trunk/conf/server.xml (original)
+++ tomcat/tc6.0.x/trunk/conf/server.xml Fri Sep 29 09:32:32 2006
@@ -192,11 +192,11 @@
 -->
 
 

svn commit: r451345 - in /tomcat/tc6.0.x/trunk/java/org/apache: catalina/startup/ContextConfig.java jasper/compiler/Generator.java

[remm]

Author: remm
Date: Fri Sep 29 09:45:17 2006
New Revision: 451345

URL: http://svn.apache.org/viewvc?view=rev&rev=451345
Log:
- Add back two reverted patches.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java?view=diff&rev=451345&r1=451344&r2=451345
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/startup/ContextConfig.java 
Fri Sep 29 09:45:17 2006
@@ -616,6 +616,7 @@
 source =
 new InputSource("file://" + file.getAbsolutePath());
 stream = new FileInputStream(file);
+context.addWatchedResource(file.getAbsolutePath());
 }
 } catch (Exception e) {
 log.error(sm.getString("contextConfig.defaultMissing") 

Modified: tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java?view=diff&rev=451345&r1=451344&r2=451345
==
--- tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/jasper/compiler/Generator.java Fri Sep 
29 09:45:17 2006
@@ -3276,7 +3276,7 @@
 out.printil("out = _jspx_out;");
 out.printil("if (out != null && out.getBufferSize() != 0)");
 out.pushIndent();
-out.printil("out.clearBuffer();");
+out.printil("try { out.clearBuffer(); } catch (java.io.IOException e) 
{}");
 out.popIndent();
 
 out



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

Re: Tomcat keepAliveTimeout

[Remy Maucherat]

Mladen Turk wrote:

Filip Hanik - Dev Lists wrote:
you are correct, soTimeout should not, imho, change depending on the 
thread count.

if the user sets 20 seconds for soTimeout then it should stay that way.



Right. With the current code you can only deduct what the actual
timeout will be. Like said, for 40 sec timeout it can be
40, 20, 13 or 2.


This is a (semi useless) feature so that, when the number of threads 
gets lower, it tends to use fewer threads (for HTTP keepalive, in 
particular). It's only for the java.io HTTP connector, which tends to 
eat threads like candy, to prevent it from exhausting the pool too fast.


I see how soTimeout would be different from keepAlivetimeout when the 
servlet is invoking a blocking read on the servletinputstream.


Actually its very simple:
soTimeout: The time to read the data.
keepAliveTimeout: The time between two requests.

Those things has been elaborated long time ago.
I'm sad that my first patch to the Tomcat get reverted immediately
without any -1. Anyhow, I'll think twice before next commit.


- java.io HTTP connector: soTimeout is used for read() operations 
(keepalive is a blocking read operation)
- APR or NIO HTTP connector: soTimeout is used for the poller timeout, 
as well as timeout for read and write operations


Both allow the disableUploadTimeout flag which increases the timeout 
used while a request is being processed (= when reading a PUT or POST, 
the timeout will be much longer).


> I see how soTimeout would be different from keepAlivetimeout when the
> servlet is invoking a blocking read on the servletinputstream.
> in that case they might want a keepalivetimeout to be fairly long, maybe
> 15 seconds, and soTimeout to be short, like less than 1 second.
> but this scenario becomes tricky, if you timeout on a servletinputstream
> read, is that an exception that the servlet should catch, and does it
> mean that the request is complete, or should the servlet attempt the
> read again?

Usually, it's the opposite: when there's a request in progress, you 
don't want to interrupt it, so timeouts are longer. For keepalive, the 
server is allowed to close the connection at any time, so it has no 
consequence for the user. At least it's the usual behavior.


My modification of Mladen's patch was a fix (the patch was not passing 
its values for the APR version) and a change so that keepaliveTimeout 
was equal to soTimeout by default.


Rémy


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

DO NOT REPLY [Bug 40645] New: - factory "parameter" in ResourceParams block

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40645

   Summary: factory "parameter" in ResourceParams block
   Product: Tomcat 5
   Version: 5.0.28
  Platform: All
OS/Version: other
Status: NEW
  Severity: enhancement
  Priority: P3
 Component: Catalina
AssignedTo: tomcat-dev@jakarta.apache.org
ReportedBy: [EMAIL PROTECTED]


enhancement request:

the manner of configuring a Resource has a questionable mechanism, where in
addition to the attributes of the Bean being instantiated, we have to supply a
non-bean parameter for the Factory.  e.g.


factory
org.apache.naming.factory.BeanFactory


it would be more intuitive if the "factory" was an attribute of the
ResourceParams tag and not a parameter, since it is outside of the scope of the
"bean" being instantiated and within the scope of the Factory mechanism provided
by Tomcat.

e.g.

instead of:



factory
org.apache.naming.factory.BeanFactory

...


we could have



...




cheers.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Re: Tomcat keepAliveTimeout

[Mladen Turk]

Remy Maucherat wrote:

Mladen Turk wrote:

Filip Hanik - Dev Lists wrote:
you are correct, soTimeout should not, imho, change depending on the 
thread count.

if the user sets 20 seconds for soTimeout then it should stay that way.



Right. With the current code you can only deduct what the actual
timeout will be. Like said, for 40 sec timeout it can be
40, 20, 13 or 2.


This is a (semi useless) feature so that, when the number of threads 
gets lower, it tends to use fewer threads (for HTTP keepalive, in 
particular). It's only for the java.io HTTP connector, which tends to 
eat threads like candy, to prevent it from exhausting the pool too fast.




semi useless, LOL :)
"when the number of threads gets lower, it tends to use fewer threads"


I was talking about the soTimeout.
Actually when the number of threads gets higher the soTimeout should
get higher as well or at least be kept at the configured value.

With the current code you can not be sure what the actual timeout is.
It can be from soTimeout to soTimeout/20 without user having any clue.

--
Mladen.

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

Re: Tomcat keepAliveTimeout

[Remy Maucherat]

Mladen Turk wrote:

semi useless, LOL :)
"when the number of threads gets lower, it tends to use fewer threads"


Ok, it's the opposite: "when the number of threads gets higher, it will 
try using fewer threads". Looking at the code will makes this obvious.



I was talking about the soTimeout.
Actually when the number of threads gets higher the soTimeout should
get higher as well or at least be kept at the configured value.


In that case, more threads will be used, which will exhaust the pool 
extremely quickly.



With the current code you can not be sure what the actual timeout is.
It can be from soTimeout to soTimeout/20 without user having any clue.


If it makes you happy, you can remove that little useless trick. It's an 
experiment I did a long time ago, nothing less, nothing more. It's also 
specific to the java.io connector, so it is not going to help or hurt 
anyone.


Rémy


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

Re: Tomcat keepAliveTimeout

[Mladen Turk]

Remy Maucherat wrote:

Mladen Turk wrote:

semi useless, LOL :)
"when the number of threads gets lower, it tends to use fewer threads"


Ok, it's the opposite: "when the number of threads gets higher, it will 
try using fewer threads". Looking at the code will makes this obvious.




Look. My patch was quite simple.
Up till the patch the soTimeout was used both for
socket timeout and for the keep-alive timeout.
I only make a keep-alive timeout configurable
independently from the soTimeout.

Why the hell you find that extra feature so inconceivable?

First of all it doesn't break anything, while it gives
an extra tuning param. If you see that option as unusable,
well, I see it as usable, so why did you revert it cause
it breaks nothing from your POV?

--
Mladen.


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

Re: Tomcat keepAliveTimeout

[Filip Hanik - Dev Lists]

I like the trick, it's smart, but I believe we could also achieve it 
with keep alive request limits, ie, when thread count gets high, turn 
off keep alive by mocking maxKeepAliveRequests="1"

ie, this way it doesn't affect the servlet and its usage of the stream.

Filip


Remy Maucherat wrote:

Mladen Turk wrote:

semi useless, LOL :)
"when the number of threads gets lower, it tends to use fewer threads"


Ok, it's the opposite: "when the number of threads gets higher, it 
will try using fewer threads". Looking at the code will makes this 
obvious.



I was talking about the soTimeout.
Actually when the number of threads gets higher the soTimeout should
get higher as well or at least be kept at the configured value.


In that case, more threads will be used, which will exhaust the pool 
extremely quickly.



With the current code you can not be sure what the actual timeout is.
It can be from soTimeout to soTimeout/20 without user having any clue.


If it makes you happy, you can remove that little useless trick. It's 
an experiment I did a long time ago, nothing less, nothing more. It's 
also specific to the java.io connector, so it is not going to help or 
hurt anyone.


Rémy


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





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

svn commit: r451370 - /tomcat/tc6.0.x/trunk/webapps/docs/config/

[fhanik]

Author: fhanik
Date: Fri Sep 29 11:09:25 2006
New Revision: 451370

URL: http://svn.apache.org/viewvc?view=rev&rev=451370
Log:
Add in skeleton documentation for clustering, so that we can document in 
accordance to all the other elements in server.xml

Added:
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-deployer.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-listener.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-receiver.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-sender.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-valve.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml
Modified:
tomcat/tc6.0.x/trunk/webapps/docs/config/project.xml

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml?view=auto&rev=451370
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-channel.xml Fri Sep 29 
11:09:25 2006
@@ -0,0 +1,46 @@
+
+
+]>
+
+
+  &project;
+
+  
+Filip Hanik
+The Cluster Channel object
+  
+
+
+
+
+
+
+  
+
+
+
+
+
+
+  
+
+  
+ 
+
+
+
+
+
+  
+
+
+  
+
+
+
+
+
+
+
+

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-deployer.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-deployer.xml?view=auto&rev=451370
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-deployer.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-deployer.xml Fri Sep 29 
11:09:25 2006
@@ -0,0 +1,46 @@
+
+
+]>
+
+
+  &project;
+
+  
+Filip Hanik
+The Cluster Deployer object
+  
+
+
+
+
+
+
+  
+
+
+
+
+
+
+  
+
+  
+ 
+
+
+
+
+
+  
+
+
+  
+
+
+
+
+
+
+
+

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml?view=auto&rev=451370
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-interceptor.xml Fri Sep 29 
11:09:25 2006
@@ -0,0 +1,46 @@
+
+
+]>
+
+
+  &project;
+
+  
+Filip Hanik
+The Channel Interceptor object
+  
+
+
+
+
+
+
+  
+
+
+
+
+
+
+  
+
+  
+ 
+
+
+
+
+
+  
+
+
+  
+
+
+
+
+
+
+
+

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-listener.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-listener.xml?view=auto&rev=451370
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-listener.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-listener.xml Fri Sep 29 
11:09:25 2006
@@ -0,0 +1,46 @@
+
+
+]>
+
+
+  &project;
+
+  
+Filip Hanik
+The ClusterListener object
+  
+
+
+
+
+
+
+  
+
+
+
+
+
+
+  
+
+  
+ 
+
+
+
+
+
+  
+
+
+  
+
+
+
+
+
+
+
+

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml?view=auto&rev=451370
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-manager.xml Fri Sep 29 
11:09:25 2006
@@ -0,0 +1,46 @@
+
+
+]>
+
+
+  &project;
+
+  
+Filip Hanik
+The ClusterManager object
+  
+
+
+
+
+
+
+  
+
+
+
+
+
+
+  
+
+  
+ 
+
+
+
+
+
+  
+
+
+  
+
+
+
+
+
+
+
+

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml?view=auto&rev=451370
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml (added)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-membership.xml Fri Sep 29 
11:09:25 2006
@@ -0,0 +1,46 @@
+
+
+]>
+
+
+  &project;
+
+  
+Filip Hanik
+The Cluster Membership object
+  
+
+
+
+
+
+
+  
+
+
+
+
+
+
+  
+
+  
+ 
+
+
+
+
+
+  
+
+
+  
+
+
+
+
+
+
+
+

Added: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-receiver.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster-receiver.xml?view=auto&rev=451370
==
--- tomcat/

Re: [6.0] Updates

[Filip Hanik - Dev Lists]

Costin Manolache wrote:

On 9/29/06, Remy Maucherat <[EMAIL PROTECTED]> wrote:


Costin Manolache wrote:
> IMO both clustering implementations should be provided as separate
> downloads.
>
> No need to put them in sandbox ( since they were released in the past,
it's
> 'proven' code ).
> Not sure if they should be in separate repos or it's ok to have 
both of

> them
> in the main tree.

Wow, this is harsh ;)

I'll maintain my position (since people hate me enough already):
- the code is proven enough so that a clustering impl remains bundled
(given it's been force fed in 5.5)



There is no question about this - that's why it can stay in the main 
tree,

it is stable code.

And I agree with you that it's better to choose one.


- it's not a good idea to remove features that were included in a

previous version



That's where I'm not sure I agree. We don't 'remove' a feature - we just
make it
available in a different package.  And 6.0 is the right place to make 
such

changes.
Nothing personal against clustering - but we need to start with 
something.




- only one implementation bundled, however; I favor the new one right

now, as Filip claims it's merely a cleanup and an evolution of the old
one, and nobody has shown yet it was hopelessly broken
- it's rather small, so it's ok (at 300k, it's far smaller than the
admin webapp), esp since people could also use it in their apps



Yes, the admin webapp should be a separate download as well :-)

The argument that people could use it doesn't hold - people use C++ or 
HTML

editors, but
it's not bundled in the core eclipse distro. Or they use LiveHeaders and
Greasemonkey, but
it's not in default firefox, neither the mail reader or html editors :-)

I think I prefer keeping a little more code in the core repository which

would otherwise be absolutely needed. It doesn't hurt, and it makes
people happy.



Sure - in repository we can keep all the code, but that doesn't mean we
should have big
monolithic releases.

We already had multiple downloads - we can even do 'tomcat complete' ( 
i.e.

tomcat
bundled with all features ) and 'tomcat essentials'  + individual 
modules.


Treating features as modules can be good for everyone.

yes, features are modules, you can comment/uncomment such in server.xml
but not sure that modules equal downloads, after all modules/features 
can share code,

and our download is still tiny if you speak in relative terms :)




Costin


Rémy


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





No virus found in this incoming message.
Checked by AVG Free Edition.
Version: 7.1.407 / Virus Database: 268.12.9/458 - Release Date: 9/27/2006
  



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

DO NOT REPLY [Bug 38898] - Tomcat service fails without error message

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=38898





--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 12:31 ---
Created an attachment (id=18938)
 --> (http://issues.apache.org/bugzilla/attachment.cgi?id=18938&action=view)
hs_err log from random death

Tomcat service stopped without error last night.  I've attached the
hs_err_pid.log.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

Re: Tomcat keepAliveTimeout

[Remy Maucherat]

Filip Hanik - Dev Lists wrote:
I like the trick, it's smart, but I believe we could also achieve it 
with keep alive request limits, ie, when thread count gets high, turn 
off keep alive by mocking maxKeepAliveRequests="1"

ie, this way it doesn't affect the servlet and its usage of the stream.


It does it too.

int keepAliveLeft = maxKeepAliveRequests;
int soTimeout = socket.getSoTimeout();
int oldSoTimeout = soTimeout;

int threadRatio = (endpoint.getCurrentThreadsBusy() * 100)
/ endpoint.getMaxThreads();
if ((threadRatio > 33) && (threadRatio <= 66)) {
soTimeout = soTimeout / 2;
} else if ((threadRatio > 66) && (threadRatio <= 90)) {
soTimeout = soTimeout / 3;
keepAliveLeft = 1;
} else if (threadRatio > 90) {
soTimeout = soTimeout / 20;
keepAliveLeft = 1;
}

So:
- less than 33% of threads used: nothing
- less than 66%: timeout / 2
- less than 90%: no keepalive and timeout / 3
- more than 90%: no keepalive and really short timeout

Overall, I think the tricks may look cool on paper, but won't do 
anything particularly useful in practice. I removed all of them after a 
very short while in the APR connector.


I suppose some of it could be kept, and some could be removed (like the 
timeout tweaking; however, since timeout with java.io doesn't work on 
output, it won't do anything unless either a client messes with the 
sending of the request header or is too slow uploading its data).


Rémy

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

svn commit: r451480 - in /tomcat/tc6.0.x/trunk: java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java webapps/docs/config/cluster.xml

[fhanik]

Author: fhanik
Date: Fri Sep 29 15:38:04 2006
New Revision: 451480

URL: http://svn.apache.org/viewvc?view=rev&rev=451480
Log:
Started documenting the cluster configuration. On to the sub components

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java?view=diff&rev=451480&r1=451479&r2=451480
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/ha/tcp/SimpleTcpCluster.java 
Fri Sep 29 15:38:04 2006
@@ -391,24 +391,26 @@
  */
 public void setProperty(String name, Object value) {
 if (log.isTraceEnabled())
-log.trace(sm.getString("SimpleTcpCluster.setProperty", name, value,
-properties.get(name)));
-
+log.trace(sm.getString("SimpleTcpCluster.setProperty", name, 
value,properties.get(name)));
 properties.put(name, value);
+//using a dynamic way of setting properties is nice, but a security 
risk
+//if exposed through JMX. This way you can sit and try to guess 
property names,
+//we will only allow explicit property names
+log.warn("Dynamic setProperty("+name+",value) has been disabled, 
please use explicit properties for the element you are trying to identify");
 if(started) {
 // FIXME Hmm, is that correct when some DeltaManagers are direct 
configured inside Context?
 // Why we not support it for other elements, like sender, receiver 
or membership?
 // Must we restart element after change?
-if (name.startsWith("manager")) {
-String key = name.substring("manager".length() + 1);
-String pvalue = value.toString();
-for (Iterator iter = managers.values().iterator(); 
iter.hasNext();) {
-Manager manager = (Manager) iter.next();
-if(manager instanceof DeltaManager && ((ClusterManager) 
manager).isDefaultMode()) {
-IntrospectionUtils.setProperty(manager, key, pvalue );
-}
-}
-} 
+//if (name.startsWith("manager")) {
+//String key = name.substring("manager".length() + 1);
+//String pvalue = value.toString();
+//for (Iterator iter = managers.values().iterator(); 
iter.hasNext();) {
+//Manager manager = (Manager) iter.next();
+//if(manager instanceof DeltaManager && ((ClusterManager) 
manager).isDefaultMode()) {
+//IntrospectionUtils.setProperty(manager, key, pvalue 
);
+//}
+//}
+//} 
 }
 }
 
@@ -504,7 +506,7 @@
 manager.setDistributable(true);
 if (manager instanceof ClusterManager) {
 ClusterManager cmanager = (ClusterManager) manager ;
-cmanager.setDefaultMode(true);
+cmanager.setDefaultMode(false);
 
cmanager.setName(getManagerName(((ClusterManager)manager).getName(),manager));
 cmanager.setCluster(this);
 }
@@ -548,7 +550,8 @@
 ClusterManager cmanager = (ClusterManager) manager ;
 cmanager.setName(clusterName);
 cmanager.setCluster(this);
-if(cmanager.isDefaultMode()) transferProperty("manager",cmanager);
+//not needed anymore, we have an explicit Manager element
+//if(cmanager.isDefaultMode()) 
transferProperty("manager",cmanager);
 }
 managers.put(clusterName, manager);
 // Notify our interested LifecycleListeners

Modified: tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml?view=diff&rev=451480&r1=451479&r2=451480
==
--- tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml (original)
+++ tomcat/tc6.0.x/trunk/webapps/docs/config/cluster.xml Fri Sep 29 15:38:04 
2006
@@ -15,32 +15,117 @@
 
 
 
-
-  
-
+  
+  The tomcat cluster implementation provides session replication, context 
attribute replication and
+  cluster wide WAR file deployment.
+  While the Cluster configuration is fairly complex, the default 
configuration will work
+  for most people out of the box. 
+  The Tomcat Cluster implementation is very extensible, and hence we have 
exposed a myriad of options,
+  making the configuration seem like a lot, but don't lose faith, instead you 
have a tremendous control
+  over what is going on.
+
+
+  To configure context attrib

svn commit: r451485 - /tomcat/tc6.0.x/trunk/RELEASE-NOTES

[remm]

Author: remm
Date: Fri Sep 29 15:42:21 2006
New Revision: 451485

URL: http://svn.apache.org/viewvc?view=rev&rev=451485
Log:
- Update the release notes.

Modified:
tomcat/tc6.0.x/trunk/RELEASE-NOTES

Modified: tomcat/tc6.0.x/trunk/RELEASE-NOTES
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/RELEASE-NOTES?view=diff&rev=451485&r1=451484&r2=451485
==
--- tomcat/tc6.0.x/trunk/RELEASE-NOTES (original)
+++ tomcat/tc6.0.x/trunk/RELEASE-NOTES Fri Sep 29 15:42:21 2006
@@ -65,13 +65,16 @@
 =
 A standard installation of Tomcat 6.0 makes all of the following APIs available
 for use by web applications (by placing them in "lib"):
+* annotations-api.jar (Annotations package)
 * catalina.jar (Tomcat Catalina implementation)
 * catalina-ant.jar (Tomcat Catalina Ant tasks)
+* catalina-ha.jar (High availability package)
+* catalina-tribes.jar (Group communication)
 * commons-logging-api.jar (Commons Logging API 1.0.x)
 * el-api.jar (EL 1.0 API)
 * jasper.jar (Jasper 2 Compiler and Runtime)
-* jasper-compiler-jdt.jar (Eclipse JDT 3.2 Java compiler)
 * jasper-el.jar (Jasper 2 EL implementation)
+* jasper-jdt.jar (Eclipse JDT 3.2 Java compiler)
 * jsp-api.jar (JSP 2.1 API)
 * servlet-api.jar (Servlet 2.5 API)
 * tomcat-coyote.jar (Tomcat connectors and utility classes)



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

svn commit: r451494 - in /tomcat/container/tc5.5.x: catalina/src/share/org/apache/catalina/servlets/CGIServlet.java webapps/docs/changelog.xml

[markt]

Author: markt
Date: Fri Sep 29 16:44:34 2006
New Revision: 451494

URL: http://svn.apache.org/viewvc?view=rev&rev=451494
Log:
Fix bug 40625. Patch by Takayoshi Kimura.

Modified:

tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
tomcat/container/tc5.5.x/webapps/docs/changelog.xml

Modified: 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java?view=diff&rev=451494&r1=451493&r2=451494
==
--- 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
 (original)
+++ 
tomcat/container/tc5.5.x/catalina/src/share/org/apache/catalina/servlets/CGIServlet.java
 Fri Sep 29 16:44:34 2006
@@ -1786,7 +1786,7 @@
 }
 catch (IOException e){
 log ("Caught exception " + e);
-throw new IOException (e.toString());
+throw e;
 }
 finally{
 if (debug > 4) {

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=451494&r1=451493&r2=451494
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Sep 29 16:44:34 2006
@@ -21,6 +21,10 @@
 29727: If env-entry values in web.xml are changed then
 ensure new vales are applied when context is reloaded. (markt)
   
+  
+40625: Stop CGIServlet swallowing the root cause of an
+exception. Patch provided by Takayoshi Kimura. (markt)
+  
 

 



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

svn commit: r451495 - /tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java

[markt]

Author: markt
Date: Fri Sep 29 16:45:02 2006
New Revision: 451495

URL: http://svn.apache.org/viewvc?view=rev&rev=451495
Log:
Port patch for 40625.

Modified:
tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java

Modified: tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java?view=diff&rev=451495&r1=451494&r2=451495
==
--- tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java 
(original)
+++ tomcat/tc6.0.x/trunk/java/org/apache/catalina/servlets/CGIServlet.java Fri 
Sep 29 16:45:02 2006
@@ -1772,7 +1772,7 @@
 }
 catch (IOException e){
 log ("Caught exception " + e);
-throw new IOException (e.toString());
+throw e;
 }
 finally{
 if (debug > 4) {



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

DO NOT REPLY [Bug 40625] - CGIServlet eats root cause

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40625


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 16:45 ---
Many thanks for the report and patch. This has been fixed in SVN and will be in
5.5.21 onwards.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r451501 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml config/context.xml config/engine.xml config/globalresources.xml config/host.xml funcspecs/mbean-names.xml jndi-resources-

[markt]

Author: markt
Date: Fri Sep 29 17:23:26 2006
New Revision: 451501

URL: http://svn.apache.org/viewvc?view=rev&rev=451501
Log:
Fix bug 40625. Remove DefaultContext from docs.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/config/context.xml
tomcat/container/tc5.5.x/webapps/docs/config/engine.xml
tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml
tomcat/container/tc5.5.x/webapps/docs/config/host.xml
tomcat/container/tc5.5.x/webapps/docs/funcspecs/mbean-names.xml
tomcat/container/tc5.5.x/webapps/docs/jndi-resources-howto.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=451501&r1=451500&r2=451501
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Sep 29 17:23:26 2006
@@ -27,6 +27,14 @@
   
 

+  
+
+  
+40633: Remove references to the DefaultContext from the
+documentation. (markt)
+  
+
+   
 
 
 

Modified: tomcat/container/tc5.5.x/webapps/docs/config/context.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/context.xml?view=diff&rev=451501&r1=451500&r2=451501
==
--- tomcat/container/tc5.5.x/webapps/docs/config/context.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/context.xml Fri Sep 29 
17:23:26 2006
@@ -150,9 +150,9 @@
   
 Set to true to have explicit settings in this
 Context element override any corresponding settings in the
-DefaultContext element associated
-with our owning Host.  By default, settings
-in the DefaultContext element will be used.
+default settings associated with the owning
+Host.  The default is false.
+
   
 
   

Modified: tomcat/container/tc5.5.x/webapps/docs/config/engine.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/engine.xml?view=diff&rev=451501&r1=451500&r2=451501
==
--- tomcat/container/tc5.5.x/webapps/docs/config/engine.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/engine.xml Fri Sep 29 17:23:26 
2006
@@ -111,10 +111,6 @@
   have a name that matches the name specified for the
   defaultHost attribute, listed above.
 
-  You can optional nest a DefaultContext
-  element inside this Engine element, to define the default
-  characteristics of web applications that are automatically deployed.
-
   You can nest at most one instance of the following utility components
   by nesting a corresponding element inside your Engine
   element:

Modified: tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml?view=diff&rev=451501&r1=451500&r2=451501
==
--- tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/globalresources.xml Fri Sep 29 
17:23:26 2006
@@ -203,7 +203,7 @@
 Use  
 elements to link resources from the global context into 
 per-web-application contexts. Here is an example of making a custom 
-factory available to all applications in the server, based on the example 
+factory available to a web applications, based on the example 
 definition in the 
 
 JNDI Resource HOW-TO:
@@ -211,13 +211,13 @@
 
 
   
 
 

Modified: tomcat/container/tc5.5.x/webapps/docs/config/host.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/config/host.xml?view=diff&rev=451501&r1=451500&r2=451501
==
--- tomcat/container/tc5.5.x/webapps/docs/config/host.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/config/host.xml Fri Sep 29 17:23:26 
2006
@@ -190,13 +190,7 @@
 
   You can nest one or more Context elements
   inside this Host element, each representing a different web
-  application associated with this virtual host.  In addition, you can nest a
-  single DefaultContext element that defines
-  default values for subsequently deployed web applications.
-
-  You can optional nest a DefaultContext
-  element inside this Host element, to define the default
-  characteristics of web applications that are automatically deployed.
+  application associated with this virtual host.
 
   You can nest at most one instance of the following utility components
   by nesting a corresponding element inside your Host
@@ -288,8 +282,7 @@
 generated Context

DO NOT REPLY [Bug 40633] - DefaultContext tag still referenced in doc.

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=40633


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 17:24 ---
Fixed in SVN and will be included in 5.5.21 onwards. NB the docs on the website
are aligned with the latest stable release so they will be upadted at the next
release.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r451507 - in /tomcat/site/trunk: docs/download-55.html xdocs/download-55.xml

[markt]

Author: markt
Date: Fri Sep 29 17:36:56 2006
New Revision: 451507

URL: http://svn.apache.org/viewvc?view=rev&rev=451507
Log: (empty)

Modified:
tomcat/site/trunk/docs/download-55.html
tomcat/site/trunk/xdocs/download-55.xml

Modified: tomcat/site/trunk/docs/download-55.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/download-55.html?view=diff&rev=451507&r1=451506&r2=451507
==
--- tomcat/site/trunk/docs/download-55.html (original)
+++ tomcat/site/trunk/docs/download-55.html Fri Sep 29 17:36:56 2006
@@ -341,7 +341,7 @@
   http://www.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz.md5";>md5)
   
   
-  Windows 
Executable 
+  Windows 
Service Installer 
   (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.exe.asc";>pgp,
 
   http://www.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.exe.md5";>md5)
   
@@ -522,7 +522,7 @@
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.tar.gz.md5";>md5)
   
   
-Windows
 Executable 
+Windows
 Service Installer 
 (http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.exe.asc";>pgp,
 
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.exe.md5";>md5)
   
@@ -667,7 +667,7 @@
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.tar.gz.md5";>md5)
   
   
-Windows
 Executable 
+Windows
 Service Installer 
 (http://www.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.exe.asc";>pgp,
 
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.exe.md5";>md5)
   

Modified: tomcat/site/trunk/xdocs/download-55.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/download-55.xml?view=diff&rev=451507&r1=451506&r2=451507
==
--- tomcat/site/trunk/xdocs/download-55.xml (original)
+++ tomcat/site/trunk/xdocs/download-55.xml Fri Sep 29 17:36:56 2006
@@ -80,7 +80,7 @@
   http://www.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.tar.gz.md5";>md5)
   
   
-  Windows 
Executable 
+  Windows 
Service Installer 
   (http://www.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.exe.asc";>pgp,
 
   http://www.apache.org/dist/tomcat/tomcat-5/v5.5.20/bin/apache-tomcat-5.5.20.exe.md5";>md5)
   
@@ -201,7 +201,7 @@
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.tar.gz.md5";>md5)
   
   
-Windows
 Executable 
+Windows
 Service Installer 
 (http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.exe.asc";>pgp,
 
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/bin/jakarta-tomcat-5.0.30.exe.md5";>md5)
   
@@ -287,7 +287,7 @@
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.tar.gz.md5";>md5)
   
   
-Windows
 Executable 
+Windows
 Service Installer 
 (http://www.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.exe.asc";>pgp,
 
 http://www.apache.org/dist/tomcat/tomcat-5/v5.0.28/bin/jakarta-tomcat-5.0.28.exe.md5";>md5)
   



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

svn commit: r451508 - /tomcat/build/tc5.5.x/tomcat.nsi

[markt]

Author: markt
Date: Fri Sep 29 17:49:37 2006
New Revision: 451508

URL: http://svn.apache.org/viewvc?view=rev&rev=451508
Log:
Make installer text clearer that Tomcat is always installed as a service.

Modified:
tomcat/build/tc5.5.x/tomcat.nsi

Modified: tomcat/build/tc5.5.x/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/build/tc5.5.x/tomcat.nsi?view=diff&rev=451508&r1=451507&r2=451508
==
--- tomcat/build/tc5.5.x/tomcat.nsi (original)
+++ tomcat/build/tc5.5.x/tomcat.nsi Fri Sep 29 17:49:37 2006
@@ -80,9 +80,9 @@
 
   ;Component-selection page
 ;Descriptions
-LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet 
container."
+LangString DESC_SecTomcat ${LANG_ENGLISH} "Install the Tomcat Servlet 
container as a Windows service."
 LangString DESC_SecTomcatCore ${LANG_ENGLISH} "Install the Tomcat Servlet 
container core."
-LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start 
Tomcat when the computer is started. This requires Windows NT 4.0, Windows 2000 
or Windows XP."
+LangString DESC_SecTomcatService ${LANG_ENGLISH} "Automatically start the 
Tomcat service when the computer is started. This requires Windows NT 4.0, 
Windows 2000 or Windows XP."
 LangString DESC_SecTomcatNative ${LANG_ENGLISH} "Downloads and installs 
Tomcat native .dll for better performance and scalability in production 
environments."
 ;LangString DESC_SecTomcatSource ${LANG_ENGLISH} "Install the Tomcat 
source code."
 LangString DESC_SecMenu ${LANG_ENGLISH} "Create a Start Menu program group 
for Tomcat."
@@ -176,7 +176,7 @@
 
 SectionEnd
 
-Section "Service" SecTomcatService
+Section "Service Startup" SecTomcatService
 
   SectionIn 3
 



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

svn commit: r451509 - in /tomcat/container/tc5.5.x/webapps/docs: changelog.xml setup.xml

[markt]

Author: markt
Date: Fri Sep 29 17:50:55 2006
New Revision: 451509

URL: http://svn.apache.org/viewvc?view=rev&rev=451509
Log:
Clarify behaviour when using Windows installer.

Modified:
tomcat/container/tc5.5.x/webapps/docs/changelog.xml
tomcat/container/tc5.5.x/webapps/docs/setup.xml

Modified: tomcat/container/tc5.5.x/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/changelog.xml?view=diff&rev=451509&r1=451508&r2=451509
==
--- tomcat/container/tc5.5.x/webapps/docs/changelog.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/changelog.xml Fri Sep 29 17:50:55 2006
@@ -30,6 +30,10 @@
   
 
   
+34952: Clarify that the Windows Installer always installs
+a Windows service. (markt)
+  
+  
 40633: Remove references to the DefaultContext from the
 documentation. (markt)
   

Modified: tomcat/container/tc5.5.x/webapps/docs/setup.xml
URL: 
http://svn.apache.org/viewvc/tomcat/container/tc5.5.x/webapps/docs/setup.xml?view=diff&rev=451509&r1=451508&r2=451509
==
--- tomcat/container/tc5.5.x/webapps/docs/setup.xml (original)
+++ tomcat/container/tc5.5.x/webapps/docs/setup.xml Fri Sep 29 17:50:55 2006
@@ -49,7 +49,7 @@
 Tray icon: When Tomcat is run as a service, there
 will not be any tray icon present when Tomcat is running. Note that
 when choosing to run Tomcat at the end of installation, the tray
-icon will be used even if Tomcat was installed as a service.
+icon will be loaded at the same time.
 Refer to the
 Windows Service HOW-TO
 for information on how to manage Tomcat as Windows NT service.



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

svn commit: r451510 - /tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/B2CConverter.java

[markt]

Author: markt
Date: Fri Sep 29 17:51:58 2006
New Revision: 451510

URL: http://svn.apache.org/viewvc?view=rev&rev=451510
Log:
Tabs to 8 spaces. No functional change.

Modified:

tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/B2CConverter.java

Modified: 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/B2CConverter.java
URL: 
http://svn.apache.org/viewvc/tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/B2CConverter.java?view=diff&rev=451510&r1=451509&r2=451510
==
--- 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/B2CConverter.java 
(original)
+++ 
tomcat/connectors/trunk/util/java/org/apache/tomcat/util/buf/B2CConverter.java 
Fri Sep 29 17:51:58 2006
@@ -49,10 +49,10 @@
 /** Create a converter, with bytes going to a byte buffer
  */
 public B2CConverter(String encoding)
-   throws IOException
+throws IOException
 {
-   this.encoding=encoding;
-   reset();
+this.encoding=encoding;
+reset();
 }
 
 
@@ -60,7 +60,7 @@
  *  The encoding remain in effect, the internal buffers remain allocated.
  */
 public  void recycle() {
-   conv.recycle();
+conv.recycle();
 }
 
 static final int BUFFER_SIZE=8192;
@@ -69,47 +69,47 @@
 /** Convert a buffer of bytes into a chars
  */
 public  void convert( ByteChunk bb, CharChunk cb )
-   throws IOException
+throws IOException
 {
-   // Set the ByteChunk as input to the Intermediate reader
-   iis.setByteChunk( bb );
-   convert(cb);
+// Set the ByteChunk as input to the Intermediate reader
+iis.setByteChunk( bb );
+convert(cb);
 }
 
 private void convert(CharChunk cb)
-   throws IOException
+throws IOException
 {
-   try {
-   // read from the reader
-   while( true ) { // conv.ready() ) {
-   int cnt=conv.read( result, 0, BUFFER_SIZE );
-   if( cnt <= 0 ) {
-   // End of stream ! - we may be in a bad state
-   if( debug>0)
-   log( "EOF" );
-   //  reset();
-   return;
-   }
-   if( debug > 1 )
-   log("Converted: " + new String( result, 0, cnt ));
-
-   // XXX go directly
-   cb.append( result, 0, cnt );
-   }
-   } catch( IOException ex) {
-   if( debug>0)
-   log( "Reseting the converter " + ex.toString() );
-   reset();
-   throw ex;
-   }
+try {
+// read from the reader
+while( true ) { // conv.ready() ) {
+int cnt=conv.read( result, 0, BUFFER_SIZE );
+if( cnt <= 0 ) {
+// End of stream ! - we may be in a bad state
+if( debug>0)
+log( "EOF" );
+//reset();
+return;
+}
+if( debug > 1 )
+log("Converted: " + new String( result, 0, cnt ));
+
+// XXX go directly
+cb.append( result, 0, cnt );
+}
+} catch( IOException ex) {
+if( debug>0)
+log( "Reseting the converter " + ex.toString() );
+reset();
+throw ex;
+}
 }
 
 public void reset()
-   throws IOException
+throws IOException
 {
-   // destroy the reader/iis
-   iis=new IntermediateInputStream();
-   conv=new ReadConvertor( iis, encoding );
+// destroy the reader/iis
+iis=new IntermediateInputStream();
+conv=new ReadConvertor( iis, encoding );
 }
 
 private final int debug=0;
@@ -130,45 +130,45 @@
 
 
 private  static String decodeString(ByteChunk mb, String enc)
-   throws IOException
+throws IOException
 {
-   byte buff=mb.getBuffer();
-   int start=mb.getStart();
-   int end=mb.getEnd();
-   if( useNewString ) {
-   if( enc==null) enc="UTF8";
-   return new String( buff, start, end-start, enc );
-   }
-   B2CConverter b2c=null;
-   if( useSpecialDecoders &&
-   (enc==null || "UTF8".equalsIgnoreCase(enc))) {
-   if( utfD==null ) utfD=new UTF8Decoder();
-   b2c=utfD;
-   }
-   if(decoders == null ) decoders=new Hashtable();
-   if( enc==null ) enc="UTF8";
-   b2c=(B2CConverter)decoders.get( enc );
-   if( b2c==null ) {
-   if( useSpecialDecoders ) {
-   if( "UTF8".equalsIgnoreCase( enc ) ) {
-   b2c=new UTF8Decoder();
-   }
-   }
-   if( b2c==null )
-   b2c=new B2CConverter( enc );
-   decoders.put( enc, b2c );
-   }
-   if( conversionBuf==null ) conversionBu

DO NOT REPLY [Bug 34952] - Installer modifies windows service when it shouldn't

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34952


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 17:54 ---
The windows installer always installs Tomcat as a service. The text and web site
could be clearer about this and I have made some changes. If you want to install
multiple services, don't use the installer, use service.bat.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 34956] - Tomcat should enforce the requirements from servlet 2.4 specification SRV.8.2

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34956


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEEDINFO|RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 18:38 ---
The quote from the spec is:

The parameters to these methods can be either...


Can is not the same as must. The language as currently written does not mean
that the only permitted parameters are the original request/response or the
wrapped request/response. The example given in comment 5 is perfectly valid for
the current spec language.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 34956] - Tomcat should enforce the requirements from servlet 2.4 specification SRV.8.2

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34956


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
 Resolution|INVALID |




--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 19:41 ---
(In reply to comment #8)
> The quote from the spec is:
> 
> The parameters to these methods can be either...
> 
> Can is not the same as must. The language as currently written does not mean
> that the only permitted parameters are the original request/response or the
> wrapped request/response. The example given in comment 5 is perfectly valid 
for
> the current spec language.

You are so wrong here:

The request and response parameters must be either the same objects as were
passed to the calling servlet’s service method or be subclasses of the
ServletRequestWrapper or ServletResponseWrapper classes that wrap
them.


That means you can use the Request/Response that Tomcat passes in, or a 
HttpServletRequest/ResponseWrapper that wraps the Request/Response that Tomcat 
passes in. And that is it.  The example in #5 isn't valid wrt the spec.


-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 35746] - session manager should be immune to system clock time changes (solution provided)

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=35746


[EMAIL PROTECTED] changed:

   What|Removed |Added

   Severity|normal  |enhancement




--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 19:41 ---
This is an enhancement rather than a bug (so marking it as such).

I doubt there will be much (any?) interest to create a patch for this since any
well managed server would use NTP or equivalent making this enhancement 
unecessary.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 34956] - Tomcat should enforce the requirements from servlet 2.4 specification SRV.8.2

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=34956





--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 19:55 ---
The spec is inconsistent. I was reading section 8.4.2 which uses "can", rather
than 14.2.5.1 which uses "must". I'll send an e-mail to the spec team.

In the meantime which do we apply? My guess is that 14.2.5.1 was the real
intention. Thoughts?

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

DO NOT REPLY [Bug 39594] - Bug for creating relative context in the server.xml

[bugzilla]

DO NOT REPLY TO THIS EMAIL, BUT PLEASE POST YOUR BUG·
RELATED COMMENTS THROUGH THE WEB INTERFACE AVAILABLE AT
.
ANY REPLY MADE TO THIS MESSAGE WILL NOT BE COLLECTED AND·
INSERTED IN THE BUG DATABASE.

http://issues.apache.org/bugzilla/show_bug.cgi?id=39594


[EMAIL PROTECTED] changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID




--- Additional Comments From [EMAIL PROTECTED]  2006-09-29 20:14 ---
Tomcat creates directories for users all the time and would not work if it did 
not.

I am afraid I do not fully understand your description but from what I do
understand this is a combination of configuration error and unfortunate choice
of incorrect configuration parameters rather than a bug.

-- 
Configure bugmail: http://issues.apache.org/bugzilla/userprefs.cgi?tab=email
--- You are receiving this mail because: ---
You are the assignee for the bug, or are watching the assignee.

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

svn commit: r451529 - /tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/PageDataImpl.java

[markt]

Author: markt
Date: Fri Sep 29 20:39:02 2006
New Revision: 451529

URL: http://svn.apache.org/viewvc?view=rev&rev=451529
Log:
Tabs to 8 spaces. No functional change.

Modified:
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/PageDataImpl.java

Modified: 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/PageDataImpl.java
URL: 
http://svn.apache.org/viewvc/tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/PageDataImpl.java?view=diff&rev=451529&r1=451528&r2=451529
==
--- 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/PageDataImpl.java 
(original)
+++ 
tomcat/jasper/tc5.5.x/src/share/org/apache/jasper/compiler/PageDataImpl.java 
Fri Sep 29 20:39:02 2006
@@ -60,19 +60,19 @@
  * @param page the page nodes from which to generate the XML view
  */
 public PageDataImpl(Node.Nodes page, Compiler compiler)
-   throws JasperException {
+throws JasperException {
 
-   // First pass
-   FirstPassVisitor firstPass = new FirstPassVisitor(page.getRoot(),
- 
compiler.getPageInfo());
-   page.visit(firstPass);
-
-   // Second pass
-   buf = new StringBuffer();
-   SecondPassVisitor secondPass
-   = new SecondPassVisitor(page.getRoot(), buf, compiler,
-   firstPass.getJspIdPrefix());
-   page.visit(secondPass);
+// First pass
+FirstPassVisitor firstPass = new FirstPassVisitor(page.getRoot(),
+  
compiler.getPageInfo());
+page.visit(firstPass);
+
+// Second pass
+buf = new StringBuffer();
+SecondPassVisitor secondPass
+= new SecondPassVisitor(page.getRoot(), buf, compiler,
+firstPass.getJspIdPrefix());
+page.visit(secondPass);
 }
 
 /**
@@ -81,11 +81,11 @@
  * @return the input stream of the XML view
  */
 public InputStream getInputStream() {
-   // Turn StringBuffer into InputStream
+// Turn StringBuffer into InputStream
 try {
 return new ByteArrayInputStream(buf.toString().getBytes("UTF-8"));
 } catch (UnsupportedEncodingException uee) {
-   // should never happen
+// should never happen
 throw new RuntimeException(uee.toString());
 }
 }
@@ -101,115 +101,115 @@
  * attributes and adds them to the jsp:root element of the XML view.
  */
 static class FirstPassVisitor
-   extends Node.Visitor implements TagConstants {
+extends Node.Visitor implements TagConstants {
 
-   private Node.Root root;
-   private AttributesImpl rootAttrs;
-   private PageInfo pageInfo;
-
-   // Prefix for the 'id' attribute
-   private String jspIdPrefix;
-
-   /*
-* Constructor
-*/
-   public FirstPassVisitor(Node.Root root, PageInfo pageInfo) {
-   this.root = root;
-   this.pageInfo = pageInfo;
-   this.rootAttrs = new AttributesImpl();
-   this.rootAttrs.addAttribute("", "", "version", "CDATA",
-   JSP_VERSION);
-   this.jspIdPrefix = "jsp";
-   }
-
-   public void visit(Node.Root n) throws JasperException {
-   visitBody(n);
-   if (n == root) {
-   /*
-* Top-level page.
-*
-* Add
-*   xmlns:jsp="http://java.sun.com/JSP/Page";
-* attribute only if not already present.
-*/
-   if (!JSP_URI.equals(rootAttrs.getValue("xmlns:jsp"))) {
-   rootAttrs.addAttribute("", "", "xmlns:jsp", "CDATA",
-  JSP_URI);
-   }
-
-   if (pageInfo.isJspPrefixHijacked()) {
-   /*
-* 'jsp' prefix has been hijacked, that is, bound to a
-* namespace other than the JSP namespace. This means that
-* when adding an 'id' attribute to each element, we can't
-* use the 'jsp' prefix. Therefore, create a new prefix 
-* (one that is unique across the translation unit) for use
-* by the 'id' attribute, and bind it to the JSP namespace
-*/
-   jspIdPrefix += "jsp";
-   while (pageInfo.containsPrefix(jspIdPrefix)) {
-   jspIdPrefix += "jsp";
-   }
-   rootAttrs.addAttribute("", "", "xmlns:" + jspIdPrefix,
-  "CDATA", JSP_URI);
-   }
-
-   root.setAttributes(rootAttrs);
-   }
-   }
+private Node.Root root;
+private AttributesImpl rootAttrs;
+