DO NOT REPLY [Bug 42996] POST with nio connector results in missing variables

2009-06-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42996





--- Comment #17 from holger.sch...@tsi-mms.de  2009-06-09 00:23:03 PST ---
I forgot to descirbe the settings I used.

This is what I changed in the server.xml:



and in CometObserver.java I set the CometEvent.setTimeout() to 10 seconds.

A least the Connectors connectionTimeout must be lower then the CometEvent
timeout .

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

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



svn commit: r782903 - in /tomcat/site/trunk: docs/security-4.html docs/security-5.html docs/security-6.html xdocs/security-4.xml xdocs/security-5.xml xdocs/security-6.xml

2009-06-09 Thread markt
Author: markt
Date: Tue Jun  9 08:05:36 2009
New Revision: 782903

URL: http://svn.apache.org/viewvc?rev=782903&view=rev
Log:
Fix cut and paste error

Modified:
tomcat/site/trunk/docs/security-4.html
tomcat/site/trunk/docs/security-5.html
tomcat/site/trunk/docs/security-6.html
tomcat/site/trunk/xdocs/security-4.xml
tomcat/site/trunk/xdocs/security-5.xml
tomcat/site/trunk/xdocs/security-6.xml

Modified: tomcat/site/trunk/docs/security-4.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-4.html?rev=782903&r1=782902&r2=782903&view=diff
==
--- tomcat/site/trunk/docs/security-4.html (original)
+++ tomcat/site/trunk/docs/security-4.html Tue Jun  9 08:05:36 2009
@@ -272,8 +272,8 @@
 
 
 Important: Information Disclosure
-   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-5515";>
-   CVE-2009-5515
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515";>
+   CVE-2008-5515
 
 
 When using a RequestDispatcher obtained from the Request, the target 
path

Modified: tomcat/site/trunk/docs/security-5.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-5.html?rev=782903&r1=782902&r2=782903&view=diff
==
--- tomcat/site/trunk/docs/security-5.html (original)
+++ tomcat/site/trunk/docs/security-5.html Tue Jun  9 08:05:36 2009
@@ -234,8 +234,8 @@
 
 
 Important: Information Disclosure
-   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-5515";>
-   CVE-2009-5515
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515";>
+   CVE-2008-5515
 
 
 When using a RequestDispatcher obtained from the Request, the target 
path

Modified: tomcat/site/trunk/docs/security-6.html
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/docs/security-6.html?rev=782903&r1=782902&r2=782903&view=diff
==
--- tomcat/site/trunk/docs/security-6.html (original)
+++ tomcat/site/trunk/docs/security-6.html Tue Jun  9 08:05:36 2009
@@ -235,8 +235,8 @@
 
 
 Important: Information Disclosure
-   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-5515";>
-   CVE-2009-5515
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515";>
+   CVE-2008-5515
 
 
 When using a RequestDispatcher obtained from the Request, the target 
path

Modified: tomcat/site/trunk/xdocs/security-4.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-4.xml?rev=782903&r1=782902&r2=782903&view=diff
==
--- tomcat/site/trunk/xdocs/security-4.xml (original)
+++ tomcat/site/trunk/xdocs/security-4.xml Tue Jun  9 08:05:36 2009
@@ -45,8 +45,8 @@
 
   
 Important: Information Disclosure
-   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-5515";>
-   CVE-2009-5515
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515";>
+   CVE-2008-5515
 
 When using a RequestDispatcher obtained from the Request, the target 
path
was normalised before the query string was removed. A request that

Modified: tomcat/site/trunk/xdocs/security-5.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-5.xml?rev=782903&r1=782902&r2=782903&view=diff
==
--- tomcat/site/trunk/xdocs/security-5.xml (original)
+++ tomcat/site/trunk/xdocs/security-5.xml Tue Jun  9 08:05:36 2009
@@ -30,8 +30,8 @@
 
   
 Important: Information Disclosure
-   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-5515";>
-   CVE-2009-5515
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515";>
+   CVE-2008-5515
 
 When using a RequestDispatcher obtained from the Request, the target 
path
was normalised before the query string was removed. A request that

Modified: tomcat/site/trunk/xdocs/security-6.xml
URL: 
http://svn.apache.org/viewvc/tomcat/site/trunk/xdocs/security-6.xml?rev=782903&r1=782902&r2=782903&view=diff
==
--- tomcat/site/trunk/xdocs/security-6.xml (original)
+++ tomcat/site/trunk/xdocs/security-6.xml Tue Jun  9 08:05:36 2009
@@ -29,8 +29,8 @@
issues, 6.0.19 is not included in the list of affected versions.
 
 Important: Information Disclosure
-   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2009-5515";>
-   CVE-2009-5515
+   http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2008-5515";>
+   CVE-2008-5515
 
 When using a RequestDispatcher obtained from the Request, the target 
path
was normalised before the query string was removed. A request that



-
To unsubscribe, e-mail: d

DO NOT REPLY [Bug 47061] JDBCStore for saving sessions doesn't support datasource

2009-06-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47061





--- Comment #6 from Steve Pugh   2009-06-09 04:07:18 PST 
---
Created an attachment (id=23778)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23778)
New version of JDBCStore supporting datasource only

I have also come up with an alternative for the JDBC session store.
Attached JDBCStoreDS.java is a new file which ONLY supports the datasource
method of getting the connection. Therefore this doesn't require any changes to
the existing "direct connection" version of the code.

The code can be used by adding the following into context.xml


  
  


where DB-TOMCAT is a datasource defined elsewhere.

There is also an optional parameter "requireDistributable". Setting this to
true will mean sessions will only be persisted to the database if the webapp is
marked as "distributable" in the web.xml. The default is false which means the
the sessions will be persisted anyway.

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

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



5.5.x branch cannot run

2009-06-09 Thread Konstantin Kolinko
I built TC 5.5 distributive from current tc5.5.x, and it is broken:

The tester app, that is run during building a release, returns status
400 for all requests, e.g.

FAIL [GET /index.jsp HTTP/1.0] Expected status=200, got status=400

and the build/build/catalina.out contains:

SEVERE: Error deploying configuration descriptor admin.xml
java.lang.NoClassDefFoundError: org/apache/catalina/util/RequestUtil
at 
org.apache.naming.resources.FileDirContext.normalize(FileDirContext.java:777)
at 
org.apache.naming.resources.FileDirContext.file(FileDirContext.java:820)
at 
org.apache.naming.resources.FileDirContext.listBindings(FileDirContext.java:333)
at 
org.apache.naming.resources.ProxyDirContext.listBindings(ProxyDirContext.java:516)
at 
org.apache.catalina.util.ExtensionValidator.validateApplication(ExtensionValidator.java:175)
at 
org.apache.catalina.core.StandardContext.start(StandardContext.java:4073)
at 
org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:760)
at 
org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:740)
at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:544)
at 
org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:626)
at 
org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:553)
at 
org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:488)
at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1150)
at 
org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:311)
at 
org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:120)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1022)
at org.apache.catalina.core.StandardHost.start(StandardHost.java:736)
at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1014)
at 
org.apache.catalina.core.StandardEngine.start(StandardEngine.java:443)
at 
org.apache.catalina.core.StandardService.start(StandardService.java:448)
at 
org.apache.catalina.core.StandardServer.start(StandardServer.java:700)
at org.apache.catalina.startup.Catalina.start(Catalina.java:552)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
at java.lang.reflect.Method.invoke(Method.java:585)
at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:295)
at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:433)

etc. for all the other web applications.

The RequestUtil is compiled and is present in /server/lib/catalina.jar,
but FileDirContext class is in /common/lib/naming-resources.jar
and does not see it.

PS: When we fix this, the expected result from tester app is two
FAIL'ures. It is how it
was a week ago. The two failures do not show up if you will call
run-tester target without calling
clean-tester before it. That is, if those JSP pages are already
compiled and Tomcat was
restarted after their compilation.

I suppose that 4.1 will have the same problem.

Best regards,
Konstantin Kolinko

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



svn commit: r782996 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-06-09 Thread kkolinko
Author: kkolinko
Date: Tue Jun  9 13:23:37 2009
New Revision: 782996

URL: http://svn.apache.org/viewvc?rev=782996&view=rev
Log:
vote

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=782996&r1=782995&r2=782996&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun  9 13:23:37 2009
@@ -161,8 +161,8 @@
   +1: markt, kkolinko
   -1: new regression - see bug for new test case
 
-* Use a more senaible default for appBase
+* Use a more sensible default for appBase
   http://svn.apache.org/viewvc?rev=782791&view=rev
   Patch by Ian Darwin
-  +1: markt
+  +1: markt, kkolinko
   -1: 



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



Tomcat Technical Documentation

2009-06-09 Thread RamNarkhede

Hi,

I have just started using Tomcat. I want to understand how tomcat works.
I've download the Tomcat Souces but I don't understand from where to start.
Where can i find the technical documentation or is there any document
explaining the same?

Thanks in advance.

Regards,
Ram
-- 
View this message in context: 
http://www.nabble.com/Tomcat-Technical-Documentation-tp23944951p23944951.html
Sent from the Tomcat - Dev mailing list archive at Nabble.com.


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



Re: Tomcat Technical Documentation

2009-06-09 Thread Filip Hanik - Dev Lists

The code itself is the best documentation there is.
You could also search google for articles and other goodies

Filip

RamNarkhede wrote:

Hi,

I have just started using Tomcat. I want to understand how tomcat works.
I've download the Tomcat Souces but I don't understand from where to start.
Where can i find the technical documentation or is there any document
explaining the same?

Thanks in advance.

Regards,
Ram
  



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



DO NOT REPLY [Bug 42996] POST with nio connector results in missing variables

2009-06-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=42996





--- Comment #18 from Filip Hanik   2009-06-09 09:25:21 PST 
---
Thank you, I will take a look today!

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

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



Re: Tomcat Technical Documentation

2009-06-09 Thread Filip Hanik - Dev Lists
I should mention that Tomcat implements the servlet and JSP 
specifications, so in there you will find the features that are being 
implemented


Filip

Filip Hanik - Dev Lists wrote:

The code itself is the best documentation there is.
You could also search google for articles and other goodies

Filip

RamNarkhede wrote:

Hi,

I have just started using Tomcat. I want to understand how tomcat works.
I've download the Tomcat Souces but I don't understand from where to 
start.

Where can i find the technical documentation or is there any document
explaining the same?

Thanks in advance.

Regards,
Ram
  



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





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



DO NOT REPLY [Bug 47318] Tomcat 6.0.20 does not include imports from included JSP

2009-06-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47318





--- Comment #7 from Tim Funk   2009-06-09 10:08:14 PST ---
Created an attachment (id=23781)
 --> (https://issues.apache.org/bugzilla/attachment.cgi?id=23781)
Patch for jasper 

Here is a patch derived from 6.0.x
[https://svn.apache.org/repos/asf/tomcat/tc6.0.x/trunk ]

Changed files are 
 - java/org/apache/jasper/compiler/ParserController.java
 - java/org/apache/jasper/compiler/Compiler.java

It works on both test cases attached to the bug as well as some other code I
have locally. Placing here instead of committing to trunk since this is my
first dive into jasper.

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

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



Re: 5.5.x branch cannot run

2009-06-09 Thread Mark Thomas
Konstantin Kolinko wrote:
> I built TC 5.5 distributive from current tc5.5.x, and it is broken:

My bad. My port of the CVE-2008-5515 patch was too hasty. I'll fix it
(and 4.1.x which will likely have the same problem0 this evening.

Mark

> 
> The tester app, that is run during building a release, returns status
> 400 for all requests, e.g.
> 
> FAIL [GET /index.jsp HTTP/1.0] Expected status=200, got status=400
> 
> and the build/build/catalina.out contains:
> 
> SEVERE: Error deploying configuration descriptor admin.xml
> java.lang.NoClassDefFoundError: org/apache/catalina/util/RequestUtil
>   at 
> org.apache.naming.resources.FileDirContext.normalize(FileDirContext.java:777)
>   at 
> org.apache.naming.resources.FileDirContext.file(FileDirContext.java:820)
>   at 
> org.apache.naming.resources.FileDirContext.listBindings(FileDirContext.java:333)
>   at 
> org.apache.naming.resources.ProxyDirContext.listBindings(ProxyDirContext.java:516)
>   at 
> org.apache.catalina.util.ExtensionValidator.validateApplication(ExtensionValidator.java:175)
>   at 
> org.apache.catalina.core.StandardContext.start(StandardContext.java:4073)
>   at 
> org.apache.catalina.core.ContainerBase.addChildInternal(ContainerBase.java:760)
>   at 
> org.apache.catalina.core.ContainerBase.addChild(ContainerBase.java:740)
>   at org.apache.catalina.core.StandardHost.addChild(StandardHost.java:544)
>   at 
> org.apache.catalina.startup.HostConfig.deployDescriptor(HostConfig.java:626)
>   at 
> org.apache.catalina.startup.HostConfig.deployDescriptors(HostConfig.java:553)
>   at 
> org.apache.catalina.startup.HostConfig.deployApps(HostConfig.java:488)
>   at org.apache.catalina.startup.HostConfig.start(HostConfig.java:1150)
>   at 
> org.apache.catalina.startup.HostConfig.lifecycleEvent(HostConfig.java:311)
>   at 
> org.apache.catalina.util.LifecycleSupport.fireLifecycleEvent(LifecycleSupport.java:120)
>   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1022)
>   at org.apache.catalina.core.StandardHost.start(StandardHost.java:736)
>   at org.apache.catalina.core.ContainerBase.start(ContainerBase.java:1014)
>   at 
> org.apache.catalina.core.StandardEngine.start(StandardEngine.java:443)
>   at 
> org.apache.catalina.core.StandardService.start(StandardService.java:448)
>   at 
> org.apache.catalina.core.StandardServer.start(StandardServer.java:700)
>   at org.apache.catalina.startup.Catalina.start(Catalina.java:552)
>   at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
>   at 
> sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:39)
>   at 
> sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:25)
>   at java.lang.reflect.Method.invoke(Method.java:585)
>   at org.apache.catalina.startup.Bootstrap.start(Bootstrap.java:295)
>   at org.apache.catalina.startup.Bootstrap.main(Bootstrap.java:433)
> 
> etc. for all the other web applications.
> 
> The RequestUtil is compiled and is present in /server/lib/catalina.jar,
> but FileDirContext class is in /common/lib/naming-resources.jar
> and does not see it.
> 
> PS: When we fix this, the expected result from tester app is two
> FAIL'ures. It is how it
> was a week ago. The two failures do not show up if you will call
> run-tester target without calling
> clean-tester before it. That is, if those JSP pages are already
> compiled and Tomcat was
> restarted after their compilation.
> 
> I suppose that 4.1 will have the same problem.
> 
> Best regards,
> Konstantin Kolinko
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 



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



svn commit: r783094 - /tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java

2009-06-09 Thread fhanik
Author: fhanik
Date: Tue Jun  9 18:51:07 2009
New Revision: 783094

URL: http://svn.apache.org/viewvc?rev=783094&view=rev
Log:
Revert http://svn.apache.org/viewvc?view=rev&revision=763566
The code is not the same as it was before. The patch applied, while it looks 
the same will grow the pool the max threads even though it doesn't need to


Modified:
tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java?rev=783094&r1=783093&r2=783094&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/threads/TaskQueue.java Tue Jun  9 
18:51:07 2009
@@ -59,13 +59,15 @@
 }
 
 public boolean offer(Runnable o) {
-if (parent != null && 
parent.getPoolSize()

svn commit: r783095 - in /tomcat/trunk/java/org/apache/tomcat/util/net: AprEndpoint.java JIoEndpoint.java NioEndpoint.java

2009-06-09 Thread fhanik
Author: fhanik
Date: Tue Jun  9 18:58:25 2009
New Revision: 783095

URL: http://svn.apache.org/viewvc?rev=783095&view=rev
Log:
Take into account that executors can be provided, standard and non standard 
thread pool executors through config or programmatically.
Hence we want to expose the correct values for curThread and curThreadBusy


Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java?rev=783095&r1=783094&r2=783095&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java Tue Jun  9 
18:58:25 2009
@@ -17,10 +17,12 @@
 
 package org.apache.tomcat.util.net;
 
+import java.lang.reflect.Method;
 import java.net.InetAddress;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -36,6 +38,7 @@
 import org.apache.tomcat.jni.SSLSocket;
 import org.apache.tomcat.jni.Socket;
 import org.apache.tomcat.jni.Status;
+import org.apache.tomcat.util.IntrospectionUtils;
 import org.apache.tomcat.util.res.StringManager;
 
 /**
@@ -538,27 +541,62 @@
 }
 }
 
-
 /**
  * Return the amount of threads that are managed by the pool.
  *
  * @return the amount of threads that are managed by the pool
  */
 public int getCurrentThreadCount() {
-return curThreads;
+if (executor!=null) {
+if (executor instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor)executor).getPoolSize();
+} else {
+try {
+Method m = 
IntrospectionUtils.findMethod(executor.getClass(), "getPoolSize", new Class[] 
{}); 
+if (m!=null) {
+return ((Integer)m.invoke(executor, null)).intValue();
+} else {
+return -1;
+}
+}catch (Exception ignore) {
+if (log.isDebugEnabled()) 
+log.debug("Unable to invoke getPoolSize",ignore);
+return -2;
+}
+}
+} else {
+return curThreads;
+}
 }
 
-
 /**
- * Return the amount of threads currently busy.
+ * Return the amount of threads that are in use 
  *
- * @return the amount of threads currently busy
+ * @return the amount of threads that are in use
  */
 public int getCurrentThreadsBusy() {
-return curThreadsBusy;
+if (executor!=null) {
+if (executor instanceof ThreadPoolExecutor) {
+return ((ThreadPoolExecutor)executor).getActiveCount();
+} else {
+try {
+Method m = 
IntrospectionUtils.findMethod(executor.getClass(), "getActiveCount", new 
Class[] {}); 
+if (m!=null) {
+return ((Integer)m.invoke(executor, null)).intValue();
+} else {
+return -1;
+}
+}catch (Exception ignore) {
+if (log.isDebugEnabled()) 
+log.debug("Unable to invoke getActiveCount",ignore);
+return -2;
+}
+}
+} else {
+return workers!=null?curThreads - workers.size():0;
+}
 }
-
-
+
 /**
  * Return the state of the endpoint.
  *

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java?rev=783095&r1=783094&r2=783095&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/JIoEndpoint.java Tue Jun  9 
18:58:25 2009
@@ -18,11 +18,13 @@
 package org.apache.tomcat.util.net;
 
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.net.BindException;
 import java.net.InetAddress;
 import java.net.ServerSocket;
 import java.net.Socket;
 import java.util.concurrent.Executor;
+import java.util.concurrent.ThreadPoolExecutor;
 
 import org.apache.juli.logging.Log;
 import org.apache.juli.logging.LogFactory;
@@ -297,12 +299,60 @@
 return paused;
 }
 
+/**
+ * Return the amount of threads that are managed by the pool.
+ *
+ * @return the am

svn commit: r783155 - /tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

2009-06-09 Thread fhanik
Author: fhanik
Date: Tue Jun  9 22:14:55 2009
New Revision: 783155

URL: http://svn.apache.org/viewvc?rev=783155&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237
There is no need to associate the Http11NioProcessor with a socket in between 
requests unless there is a comet.


Modified:
tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java

Modified: tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java?rev=783155&r1=783154&r2=783155&view=diff
==
--- tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java (original)
+++ tomcat/trunk/java/org/apache/coyote/http11/Http11NioProtocol.java Tue Jun  
9 22:14:55 2009
@@ -760,6 +760,8 @@
 NioEndpoint.KeyAttachment att = 
(NioEndpoint.KeyAttachment)socket.getAttachment(false);
 socket.getPoller().add(socket,att.getCometOps());
 } else {
+//we should not hold on to the processor objects
+release(socket);
 socket.getPoller().add(socket);
 }
 } else {



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



DO NOT REPLY [Bug 47237] Put a hard limit on Http11NioProcessor objects

2009-06-09 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=47237


Filip Hanik  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED




--- Comment #1 from Filip Hanik   2009-06-09 15:16:57 PST ---
Fixed in http://svn.apache.org/viewvc?rev=783155&view=rev
Proposed for backport into 6.0.x branch

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

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



svn commit: r783158 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-06-09 Thread fhanik
Author: fhanik
Date: Tue Jun  9 22:17:08 2009
New Revision: 783158

URL: http://svn.apache.org/viewvc?rev=783158&view=rev
Log:
proposal

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=783158&r1=783157&r2=783158&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Tue Jun  9 22:17:08 2009
@@ -166,3 +166,10 @@
   Patch by Ian Darwin
   +1: markt, kkolinko
   -1: 
+
+* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237
+  http://svn.apache.org/viewvc?rev=783155&view=rev
+  +1: fhanik
+  -1: 
+
+



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



svn commit: r783160 - /tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

2009-06-09 Thread fhanik
Author: fhanik
Date: Tue Jun  9 22:28:00 2009
New Revision: 783160

URL: http://svn.apache.org/viewvc?rev=783160&view=rev
Log:
Put a short timeout on the unlock accept

Modified:
tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java

Modified: tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java?rev=783160&r1=783159&r2=783160&view=diff
==
--- tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java (original)
+++ tomcat/trunk/java/org/apache/tomcat/util/net/NioEndpoint.java Tue Jun  9 
22:28:00 2009
@@ -1034,8 +1034,10 @@
 // Need to create a connection to unlock the accept();
 if (address == null) {
 s = new java.net.Socket("127.0.0.1", port);
+s.setSoTimeout(2000);
 } else {
 s = new java.net.Socket(address, port);
+s.setSoTimeout(2000);
 // setting soLinger to a small value will help shutdown the
 // connection quicker
 s.setSoLinger(true, 0);



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



svn commit: r783167 - /tomcat/tc6.0.x/trunk/STATUS.txt

2009-06-09 Thread funkman
Author: funkman
Date: Wed Jun 10 01:07:19 2009
New Revision: 783167

URL: http://svn.apache.org/viewvc?rev=783167&view=rev
Log:
more votes

Modified:
tomcat/tc6.0.x/trunk/STATUS.txt

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=783167&r1=783166&r2=783167&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Wed Jun 10 01:07:19 2009
@@ -129,24 +129,25 @@
 http://www.iana.org/assignments/media-types/index.html
 The rest of the change is OK.
   )
+  -1: funkman: agree with kkolinko
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
   Thread safety issues in AccessLogValve
   http://svn.apache.org/viewvc?rev=781779&view=rev
-  +1: markt
+  +1: markt, funkman
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47316
   Remove use of ServerFactory to enable MapperListener to start when service
   name != engine name
   https://issues.apache.org/bugzilla/attachment.cgi?id=23764
-  +1: markt, kkolinko
+  +1: markt, kkolinko, funkman
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47299
   Simply code. Make it work with classes that extend StandardContext
   http://svn.apache.org/viewvc?rev=782145&view=rev
-  +1: markt
+  +1: markt, funkman
   +1: kkolinko (
good.
I see no need to carry on the "Race condition is harmless" comment,
@@ -164,12 +165,12 @@
 * Use a more sensible default for appBase
   http://svn.apache.org/viewvc?rev=782791&view=rev
   Patch by Ian Darwin
-  +1: markt, kkolinko
+  +1: markt, kkolinko, funkman
   -1: 
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237
   http://svn.apache.org/viewvc?rev=783155&view=rev
-  +1: fhanik
+  +1: fhanik, funkman
   -1: 
 
 



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



[Tomcat Wiki] Update of "TomcatTrackUs09" by JeanFredericClere

2009-06-09 Thread Apache Wiki
Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Tomcat Wiki" for change 
notification.

The following page has been changed by JeanFredericClere:
http://wiki.apache.org/tomcat/TomcatTrackUs09

--
- Describe TomcatTrackUs09 here. The Tomcat track is scheduled for Wednesday
+ Tomcat track at ApacheConUS2009. The Tomcat track is scheduled for Wednesday
  
+ Project Management Committee:
+ 
+ Subprojects covered by Track:
+ 
+ PMC Liason/Spokesorganizer(s):
+ 
+ Planning Team Mentor & Liason: Jean-Frederic Clere
+ 
+ Track Description
+ 
+ Target Audience
+ 
+ Proposed Schedule
  == Draft Schedule ==
  
  || 09:00 - 10:00 || REGISTRATION||

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