DO NOT REPLY [Bug 50342] New: Exception on the Host request-header field included colon(':')

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50342

   Summary: Exception on the Host request-header field included
colon(':')
   Product: Tomcat 6
   Version: 6.0.26
  Platform: PC
Status: NEW
  Severity: minor
  Priority: P2
 Component: Connectors
AssignedTo: dev@tomcat.apache.org
ReportedBy: kni...@nhn.com


Hello.

If A tomcat receive a request contained the Host request-header field included
colon, java.io.CharConversionException is thrown.

Exception is below
2010. 11. 26 SEVERE 3:43:37 org.apache.jk.common.HandlerRequest invoke
SEVERE: Error decoding request 
java.io.CharConversionException: Invalid char in port: 103
at
org.apache.jk.common.HandlerRequest.parseHost(HandlerRequest.java:655)
at
org.apache.jk.common.HandlerRequest.decodeRequest(HandlerRequest.java:403)
at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:260)
at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:754)
at
org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:684)
at
org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:876)
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:684)
at java.lang.Thread.run(Thread.java:619)
2010. 11. 26  SEVERE 3:43:37 org.apache.jk.common.ChannelSocket
processConnection
SEVEREí: processCallbacks status 2
2010. 11. 26SEVERE 3:43:37 org.apache.jk.common.HandlerRequest invoke
SEVERE: Error decoding request 
java.io.CharConversionException: Invalid char in port: 103
at
org.apache.jk.common.HandlerRequest.parseHost(HandlerRequest.java:655)
at
org.apache.jk.common.HandlerRequest.decodeRequest(HandlerRequest.java:403)
at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:260)
at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:754)
at
org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:684)
at
org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:876)
at
org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:684)
at java.lang.Thread.run(Thread.java:619)
2010. 11. 26 SEVERE 3:43:37 org.apache.jk.common.ChannelSocket
processConnection
SEVEREí: processCallbacks status 2


So. the sample request is below :
(Host field contained two domain name ; tomcat.apache.org and www.apache.org)

telnet localhost 80
Trying 127.0.0.1...
Connected to localhost.localdomain (127.0.0.1).
Escape character is '^]'.
GET http://myweb.com/search.nhn HTTP/1.1
Accept-Language: ko-KR
User-Agent: Mozilla/4.0
Accept-Encoding: gzip, deflate
Host:  tomcat.apache.org:www.apache.org   
Connection: Keep-Alive

HTTP/1.1 502 Bad Gateway
Date: Fri, 26 Nov 2010 06:43:36 GMT
.


It looks like the HTTP 1.1 specification allows to do such call, here's the
content of HTTP 1.1 specification.

http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.23

14.23 Host
The Host request-header field specifies the Internet host and port number of
the resource being requested, as obtained from the original URI given by the
user or referring resource (generally an HTTP URL, 

as described in section 3.2.2). The Host field value MUST represent the naming
authority of the origin server or gateway given by the original URL. This
allows the origin server or gateway to differentiate between
internally-ambiguous URLs, such as the root "/" URL of a server for multiple
host names on a single IP address. 

   Host = "Host" ":" host [ ":" port ] ; Section 3.2.2


Because http specification 1.1 support multiple host name, I think tomcat may
support this. If I am wrong, let me know it. 
Every tomcat I tested show the exception. 

Thank you.

-- 
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:Re:svn commit: r1038656 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties StandardEngine.java

2010-11-25 Thread xiexiaoyang
I am very sorry for a unexpected operation.

At 2010-11-26 10:47:51,xiexiaoyang  wrote:

>dev-unsubscr...@tomcat.apache.org
>
>
>
>
>At 2010-11-24 23:58:46,ma...@apache.org wrote:
>
>>Author: markt
>>Date: Wed Nov 24 15:58:46 2010
>>New Revision: 1038656
>>
>>URL: http://svn.apache.org/viewvc?rev=1038656&view=rev
>>Log:
>>Don't swallow error
>>
>>Modified:
>>tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>>tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>>
>>Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>>URL: 
>>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1038656&r1=1038655&r2=1038656&view=diff
>>==
>>--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
>>(original)
>>+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed 
>>Nov 24 15:58:46 2010
>>@@ -152,6 +152,7 @@ standardContext.workPath=Exception obtai
>> standardContext.wrapper.error=JSP file {0} must start with a ''/'
>> standardContext.wrapper.warning=WARNING: JSP file {0} must start with a 
>> ''/'' in Servlet 2.4
>> standardEngine.alreadyStarted=Engine has already been started
>>+standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from 
>>system property
>> standardEngine.mappingError=MAPPING configuration error for server name {0}
>> standardEngine.noHost=No Host matches server name {0}
>> standardEngine.noHostHeader=HTTP/1.1 request with no Host: header
>>
>>Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>>URL: 
>>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038656&r1=1038655&r2=1038656&view=diff
>>==
>>--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
>>+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Nov 24 
>>15:58:46 2010
>>@@ -62,6 +62,7 @@ public class StandardEngine extends Cont
>> try {
>> setJvmRoute(System.getProperty("jvmRoute"));
>> } catch(Exception ex) {
>>+log.warn(sm.getString("standardEngine.jvmRouteFail"));
>> }
>> // By default, the engine will hold the reloading thread
>> backgroundProcessorDelay = 10;
>>
>>
>>
>>-
>>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>>For additional commands, e-mail: dev-h...@tomcat.apache.org
>>


Re:svn commit: r1038656 - in /tomcat/trunk/java/org/apache/catalina/core: LocalStrings.properties StandardEngine.java

2010-11-25 Thread xiexiaoyang
dev-unsubscr...@tomcat.apache.org




At 2010-11-24 23:58:46,ma...@apache.org wrote:

>Author: markt
>Date: Wed Nov 24 15:58:46 2010
>New Revision: 1038656
>
>URL: http://svn.apache.org/viewvc?rev=1038656&view=rev
>Log:
>Don't swallow error
>
>Modified:
>tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>
>Modified: tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties
>URL: 
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties?rev=1038656&r1=1038655&r2=1038656&view=diff
>==
>--- tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties 
>(original)
>+++ tomcat/trunk/java/org/apache/catalina/core/LocalStrings.properties Wed Nov 
>24 15:58:46 2010
>@@ -152,6 +152,7 @@ standardContext.workPath=Exception obtai
> standardContext.wrapper.error=JSP file {0} must start with a ''/'
> standardContext.wrapper.warning=WARNING: JSP file {0} must start with a ''/'' 
> in Servlet 2.4
> standardEngine.alreadyStarted=Engine has already been started
>+standardEngine.jvmRouteFail=Failed to set Engine's jvmRoute attribute from 
>system property
> standardEngine.mappingError=MAPPING configuration error for server name {0}
> standardEngine.noHost=No Host matches server name {0}
> standardEngine.noHostHeader=HTTP/1.1 request with no Host: header
>
>Modified: tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java
>URL: 
>http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java?rev=1038656&r1=1038655&r2=1038656&view=diff
>==
>--- tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java (original)
>+++ tomcat/trunk/java/org/apache/catalina/core/StandardEngine.java Wed Nov 24 
>15:58:46 2010
>@@ -62,6 +62,7 @@ public class StandardEngine extends Cont
> try {
> setJvmRoute(System.getProperty("jvmRoute"));
> } catch(Exception ex) {
>+log.warn(sm.getString("standardEngine.jvmRouteFail"));
> }
> // By default, the engine will hold the reloading thread
> backgroundProcessorDelay = 10;
>
>
>
>-
>To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
>For additional commands, e-mail: dev-h...@tomcat.apache.org
>


RE: Tomcat 6 / Mysql with connection Pool Error isValid Method

2010-11-25 Thread Caldarale, Charles R
> From: EmCpam [mailto:emmanuel.lallem...@laposte.net] 
> Subject: Re: Tomcat 6 / Mysql with connection Pool Error isValid Method

> is it possible to move this subjet to the user list ?

No, you will have to resend the message to the proper address - assuming you 
have subscribed to the users list.

 - Chuck


THIS COMMUNICATION MAY CONTAIN CONFIDENTIAL AND/OR OTHERWISE PROPRIETARY 
MATERIAL and is thus for use only by the intended recipient. If you received 
this in error, please contact the sender and delete the e-mail and its 
attachments from all computers.



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



DO NOT REPLY [Bug 48837] Memory leaks protection does not cure leaks triggered by JSP pages code

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48837

--- Comment #3 from Sylvain Laurent  2010-11-25 
16:31:10 EST ---
Thanks Mark.
Just to clarify things : the patch just improves the detection of such leaks.
To cure them (besides fixing the webapp code), you'll have to enable the
(unsafe) clearReferencesThreadLocals option on the StandardContext or wait for
bug 49159 to be fixed.

-- 
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



DO NOT REPLY [Bug 49159] Improve ThreadLocal memory leak clean-up

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49159

--- Comment #15 from Sylvain Laurent  2010-11-25 
16:25:32 EST ---
Though my proposed patch renews threads in the pool, there are actually 2 other
types of threads that can prevent an application from being garbage collected
if it has ThreadLocal-related leaks : 
- the "main" thread (the one when starting up tomcat)
- the ContainerBackgroundProcessor thread
(- the shutdown hook thread too, but since the JVM is shutting down it does not
really matter)
- in an embedded scenario, the thread of the "containing" application

Currently when a webapp is started or stopped, the lifecycle callbacks into the
webapp (context listener, filters, servlet) are executed by one of those
threads.

I'm working on a patch where I spawn a thread that runs just during those
callbacks then shuts down, and so far it prevents such leaks.

-- 
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: fixing subject of Bugzilla issues

2010-11-25 Thread Konstantin Kolinko
2010/11/25 Sylvain Laurent :
> Is it OK to change the subject field of bugzilla issues ?
> For instance the subject of 
> https://issues.apache.org/bugzilla/show_bug.cgi?id=48837 is currently "Memory 
> leaks protection does not cure leaks triggered by JSP pages code"
>
> After Mark applied the patch, I'd prefer to have the following subject which 
> better reflects the final status/outcome of the bug : "Memory leaks 
> protection does not detect leaks triggered by JSP pages code"
>

You want to s/cure/detect/ ?

I guess you are confusing the goal and the root cause of the issue.
The problem was that memory leaks protection cannot apply its remedy
to those leaks, and the issue is solved only if it is able to do that.

Being able to detect them is just a part of the issue (the root cause
of it). If it fixes the whole issue, it is good.

> Is there an established rule on this subject (pun intended) ?

None.

Renames in bugzilla do happen, but otherwise I'd prefer to focus on
the changelog file. That is what people read.


Best regards,
Konstantin Kolinko

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



fixing subject of Bugzilla issues

2010-11-25 Thread Sylvain Laurent
Is it OK to change the subject field of bugzilla issues ?
For instance the subject of 
https://issues.apache.org/bugzilla/show_bug.cgi?id=48837 is currently "Memory 
leaks protection does not cure leaks triggered by JSP pages code"

After Mark applied the patch, I'd prefer to have the following subject which 
better reflects the final status/outcome of the bug : "Memory leaks protection 
does not detect leaks triggered by JSP pages code"

Is there an established rule on this subject (pun intended) ?

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



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

2010-11-25 Thread rjung
Author: rjung
Date: Thu Nov 25 18:55:04 2010
New Revision: 1039142

URL: http://svn.apache.org/viewvc?rev=1039142&view=rev
Log:
Answer question.

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=1039142&r1=1039141&r2=1039142&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 18:55:04 2010
@@ -186,6 +186,9 @@ PATCHES PROPOSED TO BACKPORT:
   -0: markt - http://markmail.org/thread/777be426ulcfmdd3 suggests there may be
   a memory leak in this code somewhere. I'd like to get to the
   bottom of that before porting this
+  rjung:  I started a discussion about JSPs and memory on the dev list.
+  The updated patch fixes a race condition.
+  We can stall this item until we get some feedback about 7.0.5.
   -1:
 
 * Add session creation / expiration rate statistics to the session managers



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



Memory consumption when using JSPs

2010-11-25 Thread Rainer Jung
This is a followup to http://markmail.org/thread/777be426ulcfmdd3 and 
Mark's remark in the TC 6 status file.


Concerning Entry objects: there were race conditions in the original 
code. It is not unlikely that the problem is fixed in 7.0.5.


But there are more interesting memory observations concerning JSPs:

Users switching from TC 5.0 (sic) to newer version note an increased 
memory demand when using lots of JSPs. A partial solution is the patch 
to unload JSPs when a configured number of loaded JSPs is reached, which 
was provided via BZ 48358 and later slightly improved. A backport 
proposal for the patch is part of the status file.


When inspecting the patch and especially looking at a multi gigabyte 
heap dump, I noticed that lots of memory were consumed by objects which 
are generated and primarily only needed during the compilation phase. 
This is due to a change in TC 5.5.13 which only applies to development 
mode. Since r322516 we keep lots of objects which are generated during 
the JSP compilation:


+// Only get rid of the pageNodes if in production.
+// In development mode, they are used for detailed
+// error messages.
+// http://issues.apache.org/bugzilla/show_bug.cgi?id=37062
+if(!this.options.getDevelopment()) {
 pageNodes = null;
+}

Remy already remarked at that time about the increased memory use but it 
seemed acceptable for development mode (since JSP recompilation can also 
be done without development mode using checkInterval).


Caution: I don't exactly remember whether the o.a.jasper.util.Entry 
objects mentioned in the original thread were also part of that. I 
remember there were *lots* of Stack and Mark objects.


Even without development mode there are some sub optimal constructs. It 
seems that more memory could be saved by throwing away the Compiler 
object after compilation is done, but this can't be done because at the 
moment the function isOutdated() is implemented inside the Compiler.


Finally I noticed another very old inefficiency: whenever modification 
timestamps are checked, we actually load the full file contents. That 
leads to a lot of garbage production (and IO activity) due to 
modification time checks for JSPs.


Regards,

Rainer


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



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

2010-11-25 Thread Mladen Turk

On 11/25/2010 06:40 PM, ma...@apache.org wrote:

Author: markt

  * Backport AprEndpoint shutdown patch (BZ49795 and similar).

http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprshutdown.patch
+1: mturk
+  -0: markt - Patch doesn't apply cleanly to tc6.0.x/trunk



Sure since it was written and proposed before your r1039103 commit.


Regards
--
^TM

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



svn propchange: r1039101 - svn:log

2010-11-25 Thread kkolinko
Author: kkolinko
Revision: 1039101
Modified property: svn:log

Modified: svn:log at Thu Nov 25 18:04:21 2010
--
--- svn:log (original)
+++ svn:log Thu Nov 25 18:04:21 2010
@@ -1,2 +1,4 @@
-Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
-Add support for trailing headers in chunked HTTP requests. The header length 
is limited to 8192 by default and the limit can be changed via a system 
property. markt/kkolinko
+Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50222
+Pin the system rather than the common class loader in memory which will
+work better in an embedded environment.
+Patch provided by Christopher Schultz.


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



Re: Tomcat 6 / Mysql with connection Pool Error isValid Method

2010-11-25 Thread EmCpam

Ok, sorry for the mistake, is it possible to move this subjet to the user
list ? If not, i will create a nex subject in the right list.

Thanks,
Emmanuel




markt-2 wrote:
> 
> On 25/11/2010 15:50, EmCpam wrote:
>> 
>> Hello, 
>> 
>> I've a problem when i use the  isValid method of Connection class with a
>> connection pool.
> 
> This question belongs on the users list, not the dev list.
> 
> Mark
> 
> -
> To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
> For additional commands, e-mail: dev-h...@tomcat.apache.org
> 
> 
> 

-- 
View this message in context: 
http://old.nabble.com/Tomcat-6---Mysql-with-connection-Pool--Error-isValid-Method-tp30306398p30307289.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



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

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 17:40:05 2010
New Revision: 1039109

URL: http://svn.apache.org/viewvc?rev=1039109&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=1039109&r1=1039108&r2=1039109&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 17:40:05 2010
@@ -101,20 +101,8 @@ PATCHES PROPOSED TO BACKPORT:
 
 * Fix path parameter handling. Currently the following URL fails with a 404:
   http://localhost:8080/examples/jsp/snp;x=y/snoop.jsp
-  http://people.apache.org/~markt/patches/2010-10-06-path-param-tc6.patch
-  +1: markt
-  +1: kkolinko:
-with the following trivial changes:
- - with r1022389 and r1035973
- - with access logging as done by r1030188
- - Mark CoyoteAdapter.parseSessionId(..) as @deprecated, because it is no 
more used
-   In the updated patch below I replaced its implementation with a call to 
parsePathParameters().
- - Add 'coyoteAdapter.parsePathParam' message to 
org/apache/catalina/connector/LocalStrings.properties
-  -1:
-
-Updated patch, based on markt's one and my above comments:
   http://people.apache.org/~kkolinko/patches/2010-11-17_tc6_path-params.patch
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
kkolinko: The old parseSessionId() method calls 
"clearRequestedSessionURL(request);"
@@ -195,6 +183,9 @@ PATCHES PROPOSED TO BACKPORT:
   Combined TC 6 patch:
   
http://people.apache.org/~rjung/patches/BZ48358-JSP_Unloading-TC6_20101118.patch
   +1: rjung
+  -0: markt - http://markmail.org/thread/777be426ulcfmdd3 suggests there may be
+  a memory leak in this code somewhere. I'd like to get to the
+  bottom of that before porting this
   -1:
 
 * Add session creation / expiration rate statistics to the session managers
@@ -207,23 +198,24 @@ PATCHES PROPOSED TO BACKPORT:
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50228
   Improve recycling of BodyContentImpl.
   http://svn.apache.org/viewvc?rev=1037794&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Configure manager and host-manager webapps to use HttpOnly for session 
cookies
   http://people.apache.org/~kkolinko/patches/2010-11-22_tc6_httpOnly.patch
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50316
   Fix minor glitch with display of negative values in Manager webapp
   http://svn.apache.org/viewvc?rev=1037887&view=rev
-  +1: kkolinko
+  +1: kkolinko, markt
   -1:
 
 * Backport AprEndpoint shutdown patch (BZ49795 and similar).
   http://people.apache.org/~mturk/tomcat/patches/tomcat-6.0.x-aprshutdown.patch
   +1: mturk
+  -0: markt - Patch doesn't apply cleanly to tc6.0.x/trunk
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48837



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



svn commit: r1039106 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/loader/LocalStrings.properties java/org/apache/catalina/loader/WebappClassLoader.java webapps/docs/changelog.xml

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 17:23:56 2010
New Revision: 1039106

URL: http://svn.apache.org/viewvc?rev=1039106&view=rev
Log:
Make memory leak prevention code that clears ThreadLocal instances more robust 
against objects with toString() methods that throw exceptions.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/LocalStrings.properties
tomcat/tc6.0.x/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 17:23:56 2010
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1037715,1037924
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750

DO NOT REPLY [Bug 50273] AprEndpoint logs socket accept fails altough error is harmless

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50273

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #11 from Mark Thomas  2010-11-25 12:22:25 EST ---
Fixed in 6.0.x and will be included in 6.0.30 onwards.

-- 
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: r1039103 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/tomcat/util/net/AprEndpoint.java webapps/docs/changelog.xml

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 17:20:56 2010
New Revision: 1039103

URL: http://svn.apache.org/viewvc?rev=1039103&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50273
Provide a workaround for an HP-UX issue that can result in large numbers of 
SEVERE log messages appearing in the logs as a result of normal operation.

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/AprEndpoint.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 17:20:56 2010
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033448,1033842,1037924
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,

DO NOT REPLY [Bug 50222] JreMemoryLeakPreventionListener should speculatively cause memory leaks using the system ClassLoader

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50222

--- Comment #3 from Mark Thomas  2010-11-25 12:19:38 EST ---
Fixed in 6.0.x and will be included in 6.0.30 onwards.

-- 
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: r1039101 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java webapps/docs/changelog.xml

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 17:17:59 2010
New Revision: 1039101

URL: http://svn.apache.org/viewvc?rev=1039101&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Add support for trailing headers in chunked HTTP requests. The header length is 
limited to 8192 by default and the limit can be changed via a system property. 
markt/kkolinko

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt

tomcat/tc6.0.x/trunk/java/org/apache/catalina/core/JreMemoryLeakPreventionListener.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 17:17:59 2010
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003461,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767,1033415,1033842,1037924
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,

DO NOT REPLY [Bug 49860] getParameters() fails on chunked POST requests with trailers

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49860

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #3 from Mark Thomas  2010-11-25 11:42:24 EST ---
This has been fixed in 6.0.x and will be included in 6.0.30 onwards.

-- 
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: r1039090 - in /tomcat/tc6.0.x/trunk: ./ STATUS.txt java/org/apache/coyote/Constants.java java/org/apache/coyote/http11/filters/ChunkedInputFilter.java webapps/docs/changelog.xml webapps/do

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 16:40:55 2010
New Revision: 1039090

URL: http://svn.apache.org/viewvc?rev=1039090&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Add support for trailing headers in chunked HTTP requests. The header length is 
limited to 8192 by default and the limit can be changed via a system property. 
markt/kkolinko

Modified:
tomcat/tc6.0.x/trunk/   (props changed)
tomcat/tc6.0.x/trunk/STATUS.txt
tomcat/tc6.0.x/trunk/java/org/apache/coyote/Constants.java

tomcat/tc6.0.x/trunk/java/org/apache/coyote/http11/filters/ChunkedInputFilter.java
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/systemprops.xml

Propchange: tomcat/tc6.0.x/trunk/
--
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Nov 25 16:40:55 2010
@@ -1 +1 @@
-/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,740675,740684,742677,742697,742714,744160,744238,746321,746384,746425,747834,747863,748344,750258,750291,750921,751286-751287,751289,751295,752323,753039,757335,757774,758249,758365,758596,758616,758664,759074,761601,762868,762929,762936-762937,763166,763183,763193,763228,763262,763298,763302,763325,763599,763611,763654,763681,763706,764985,764997,765662,768335,769979,770716,77
 
0809,770876,772872,776921,776924,776935,776945,777464,777466,777576,777625,778379,778523-778524,781528,781779,782145,782791,783316,783696,783724,783756,783762,783766,783863,783934,784453,784602,784614,785381,785688,785768,785859,786468,786487,786490,786496,786667,787627,787770,787985,789389,790405,791041,791184,791194,791224,791243,791326,791328,791789,792740,793372,793757,793882,793981,794082,794673,794822,795043,795152,795210,795457,795466,797168,797425,797596,797607,802727,802940,804462,804544,804734,805153,809131,809603,810916,810977,812125,812137,812432,813001,813013,813866,814180,814708,814876,815972,816252,817442,817822,819339,819361,820110,820132,820874,820954,821397,828196,828201,828210,828225,828759,830378-830379,830999,831106,831774,831785,831828,831850,831860,832214,832218,833121,833545,834047,835036,835336,836405,881396,881412,883130,883134,883146,883165,883177,883362,883565,884341,885038,885231,885241,885260,885901,885991,886019,888072,889363,889606,889716,8901
 
39,890265,890349-890350,890417,891185-891187,891583,892198,892341,892415,892464,892555,892812,892814,892817,892843,892887,893321,893493,894580,894586,894805,894831,895013,895045,895057,895191,895392,895703,896370,896384,897380-897381,897776,898126,898256,898468,898527,898555,898558,898718,898836,898906,899284,899348,899420,899653,899769-899770,899783,899788,899792,899916,899918-899919,899935,899949,903916,905020,905151,905722,905728,905735,907311,907513,907538,907652,907819,907825,907864,908002,908721,908754,908759,909097,909206,909212,909525,909636,909869,909875,909887,910266,910370,910442,910471,910485,910974,915226,915737,915861,916097,916141,916157,916170,917598,917633,918093,918489,918594,918684,918787,918792,918799,918803,918885,919851,919914,920025,920055,920298,920449,920596,920824,920840,921444,922010,926716,927062,927621,928482,928695,928732,928798,931709,932357,932967,935105,935983,939491,939551,940064,941356,941463,944409,944416,945231,945808,945835,945841,946686
 
,948057,950164,950596,950614,950851,950905,951615,953434,954435,955648,955655,956832,957130,957830,958192,960701,962865,962872,962881,962900,963865,963868,964614,966177-966178,966292,966692,981815,988448,991837,993042,1001955,1002185,1002263,1002274,1002349,1002359,1002362,1002481,1002514,1003481,1003488,1003556,1003572,1003581,1003861,1004868-1004869,1005452,1005467,1005647,1005802,1022120,1022134,1022323,1022415,1022606,1022623,1024224,1024251,1026042,1026784,1026912,1026920,1029767
+/tomcat/trunk:601180,606992,612607,630314,640888,652744,653247,666232,673796,673820,677910,683969,683982,684001,684081,684234,684269-684270,685177,687503,687645,689402,690781,691392,691805,692748,693378,694992,695053,695311,696780,696782,698012,698227,698236,698613,699427,699634,701355,709294,709811,709816,710063,710066,710125,710205,711126,711600,712461,712467,713953,714002,718360,719119,719124,719602,719626,719628,720046,720069,721040,721286,721708,721886,723404,723738,726052,727303,728032,728768,728947,729057,729567,729569,729571,729681,729809,729815,729934,730250,730590,731651,732859,732863,734734,7406

Re: svn commit: r1036595 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ test/org/apache/catalina/session/

2010-11-25 Thread Mark Thomas
On 25/11/2010 16:10, Remy Maucherat wrote:
> On Thu, 2010-11-18 at 19:59 +, ma...@apache.org wrote:
>> Author: markt
>> Date: Thu Nov 18 19:59:11 2010
>> New Revision: 1036595
>>
>> URL: http://svn.apache.org/viewvc?rev=1036595&view=rev
>> Log:
>> Fix expiration statistics broken by r1036281
>> Add session creation and expiration rate statistics based on the 100 most 
>> recently created/expired sessions
>> Modify average session alive time to also use 100 most recently expired 
>> sessions
>> Update benchmarks - new statistics add overhead but not significant in 
>> overall processing chain
> 
> But going back to the original optimization work, I still don't quite
> understand. As Tim pointed out, the MD5 hash is probably bad, and

I wouldn't call it bad. It doesn't do any harm (apart from adding a very
small amount of overhead), and it would help if the random source
selected ended up not being that random.

I thought the trade-off of protection against bad choices of random
sources was worth the minimal overhead added. I'm not against removing
it entirely, if there is consensus to do so.

> SecureRandom is already internally thread safe. So the simplest
> refactoring (remove the hash and the synchroinized block) was not
> tested. Is it really a big enough bottleneck which would need the more
> complex plumbing to parallelize ?

For SecureRandom, yes. I did test this locally and it achieves
thread-safety by using an internal sync and it did create a significant
bottleneck. That is why I went the parallel route. Reading from a stream
has a similar sync so again that is why I went the parallel route.

How about this as an approach to reduce the complexity:
1. Remove the MD5 code (optional)
2. Default to /dev/urandom then SecureRandom. Don't fall back to Random.
3. Provide a class that implements Random that reads data from a file
4. If randomFile is specified, use the the class from 3 as the Random source

That should reduce the current 3 Queues to one. I doubt it will improve
performance much but it should make the code clearer.

Thoughts?

Mark

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



DO NOT REPLY [Bug 50339] mod_jk parsing error if workers.properties contains whitespaces

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50339

--- Comment #1 from Frank  2010-11-25 11:21:28 EST ---
Forgot the link to the Ubuntu Launchpad bug report:
https://bugs.launchpad.net/ubuntu/+source/libapache-mod-jk/+bug/592576

-- 
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



DO NOT REPLY [Bug 50339] New: mod_jk parsing error if workers.properties contains whitespaces

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50339

   Summary: mod_jk parsing error if workers.properties contains
whitespaces
   Product: Tomcat Connectors
   Version: unspecified
  Platform: HP
OS/Version: Linux
Status: NEW
  Severity: normal
  Priority: P2
 Component: mod_jk
AssignedTo: dev@tomcat.apache.org
ReportedBy: muel...@wave-computer.de


I built tomcat-connectors-1.2.31 for httpd-2.2.17, but mod_jk logged a lot of
configuration errors, and only removing whitespaces from the beginning of all
lines in workers.properties solved it.


My workers properties looked like this:

### Templates ###
  worker.tpl2.type=ajp13
  worker.tpl2.lbfactor=100
  worker.tpl2.fail_on_status=500,503
  worker.tpl2.socket_timeout=0
  worker.tpl2.connect_timeout=5
  worker.tpl2.connection_pool_size=4

And the mod_jk.log said:
[Thu Nov 25 16:02:54 2010] [8081:140330511210240] [debug]
jk_map_read_property::jk_map.c (491): Adding property 'worker.tpl2.lbfactor'
with value '000' to map.
[Thu Nov 25 16:02:54 2010] [8081:140330511210240] [error]
jk_map_validate_property::jk_map.c (404): The attribute
'worker.tpl2.socket_tioeout' is not supported - please check the documentation
for the supported attributes.

As you can see the value for lbfactor should be "100", but "000" was logged,
and "socket_timeout" is written correctly in the config file, but the log says
"socket_tioeout"
I commented out these lines just to see what happens, but that just made it
complain about different values a few lines below.

Removing all whitespaces from the beginning of the lines solved it:
[Thu Nov 25 16:27:36 2010] [8453:139761970366208] [debug]
jk_map_read_property::jk_map.c (491): Adding property
'worker.tpl2.socket_timeout' with value '0' to map.


There also was an Ubuntu bug filed for that problem, but because I built the
module myself and did not use distribution packages, it seems that the error is
in mod_jk itself.

Cheers,
Frank

-- 
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: svn commit: r1036595 - in /tomcat/trunk: java/org/apache/catalina/ java/org/apache/catalina/ha/session/ java/org/apache/catalina/session/ test/org/apache/catalina/session/

2010-11-25 Thread Remy Maucherat
On Thu, 2010-11-18 at 19:59 +, ma...@apache.org wrote:
> Author: markt
> Date: Thu Nov 18 19:59:11 2010
> New Revision: 1036595
> 
> URL: http://svn.apache.org/viewvc?rev=1036595&view=rev
> Log:
> Fix expiration statistics broken by r1036281
> Add session creation and expiration rate statistics based on the 100 most 
> recently created/expired sessions
> Modify average session alive time to also use 100 most recently expired 
> sessions
> Update benchmarks - new statistics add overhead but not significant in 
> overall processing chain

But going back to the original optimization work, I still don't quite
understand. As Tim pointed out, the MD5 hash is probably bad, and
SecureRandom is already internally thread safe. So the simplest
refactoring (remove the hash and the synchroinized block) was not
tested. Is it really a big enough bottleneck which would need the more
complex plumbing to parallelize ?

Rémy



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



DO NOT REPLY [Bug 48545] truststorePass used in JSSESocketFactory should be optional (nillable)

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=48545

Mark Thomas  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||FIXED

--- Comment #4 from Mark Thomas  2010-11-25 11:03:09 EST ---
The updated patch has been applied to 6.0.x and will be included in 6.0.30
onwards.

-- 
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: r1039080 - in /tomcat/tc6.0.x/trunk: STATUS.txt java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties webapps/docs/ch

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 16:01:16 2010
New Revision: 1039080

URL: http://svn.apache.org/viewvc?rev=1039080&view=rev
Log:
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48545
Truststores don't have to have passwords
Based on a patch by 'smmwpf54'

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

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java

tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/res/LocalStrings.properties
tomcat/tc6.0.x/trunk/webapps/docs/changelog.xml
tomcat/tc6.0.x/trunk/webapps/docs/config/http.xml

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1039080&r1=1039079&r2=1039080&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 16:01:16 2010
@@ -45,13 +45,6 @@ PATCHES PROPOSED TO BACKPORT:
   and fix it later if needed? I think that actually nobody besides the 
release manager
   uses this, so I am letting this pass.
 
-* Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48545
-  Truststores don't have to have passwords
-  Based on a patch by 'smmwpf54'
-  https://issues.apache.org/bugzilla/attachment.cgi?id=26268
-  +1: kkolinko, markt, jfclere
-  -1:
-
 * Configure Tomcat to use HttpOnly for session cookies by default
   
http://people.apache.org/~kkolinko/patches/2010-04-21_tc6_context_httpOnly.patch
   +1: kkolinko

Modified: 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java?rev=1039080&r1=1039079&r2=1039080&view=diff
==
--- 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 (original)
+++ 
tomcat/tc6.0.x/trunk/java/org/apache/tomcat/util/net/jsse/JSSESocketFactory.java
 Thu Nov 25 16:01:16 2010
@@ -266,7 +266,15 @@ public class JSSESocketFactory
 if (keystoreFile == null)
 keystoreFile = defaultKeystoreFile;
 
-return getStore(type, provider, keystoreFile, pass);
+try {
+return getStore(type, provider, keystoreFile, pass);
+} catch (FileNotFoundException fnfe) {
+throw fnfe;
+} catch (IOException ioe) {
+log.error(sm.getString("jsse.keystore_load_failed", type,
+keystoreFile, ioe.getMessage()), ioe);
+throw ioe;
+}
 }
 
 /*
@@ -316,9 +324,33 @@ public class JSSESocketFactory
 log.debug("trustProvider = " + truststoreProvider);
 }
 
-if (truststoreFile != null && truststorePassword != null){
-trustStore = getStore(truststoreType, truststoreProvider,
-truststoreFile, truststorePassword);
+if (truststoreFile != null) {
+try {
+trustStore = getStore(truststoreType, truststoreProvider,
+truststoreFile, truststorePassword);
+} catch (FileNotFoundException fnfe) {
+throw fnfe;
+} catch (IOException ioe) {
+// Log a warning that we had a password issue
+// and re-try, unless the password is null already
+if (truststorePassword != null) {
+log.warn(sm.getString("jsse.invalid_truststore_password"),
+ioe);
+try {
+trustStore = getStore(truststoreType,
+truststoreProvider, truststoreFile, null);
+ioe = null;
+} catch (IOException ioe2) {
+ioe = ioe2;
+}
+}
+if (ioe != null) {
+log.error(sm.getString("jsse.keystore_load_failed",
+truststoreType, truststoreFile, ioe.getMessage()),
+ioe);
+throw ioe;
+}
+}
 }
 
 return trustStore;
@@ -347,15 +379,19 @@ public class JSSESocketFactory
 istream = new FileInputStream(keyStoreFile);
 }
 
-ks.load(istream, pass.toCharArray());
+char[] storePass = null;
+if (pass != null && !"".equals(pass)) {
+storePass = pass.toCharArray();
+}
+ks.load(istream, storePass);
 } catch (FileNotFoundException fnfe) {
 log.error(sm.getString("jsse.keystore_load_failed", type, path,
 fnfe.getMessage()), fnfe);
 throw fnfe;
 } catch (IOException ioe) {
-log.error(sm.getString("jsse.keystore_load_failed", type, path,
-ioe.getMessage()), ioe);
-  

Re: Tomcat 6 / Mysql with connection Pool Error isValid Method

2010-11-25 Thread Mark Thomas
On 25/11/2010 15:50, EmCpam wrote:
> 
> Hello, 
> 
> I've a problem when i use the  isValid method of Connection class with a
> connection pool.

This question belongs on the users list, not the dev list.

Mark

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



Tomcat 6 / Mysql with connection Pool Error isValid Method

2010-11-25 Thread EmCpam

Hello, 

I've a problem when i use the  isValid method of Connection class with a
connection pool.
The java exception is:

javax.servlet.ServletException:
com.sun.jersey.api.container.ContainerException:
java.lang.AbstractMethodError:
org.apache.tomcat.dbcp.dbcp.PoolingDataSource$PoolGuardConnectionWrapper.isValid(I)Z

com.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:346)
javax.servlet.http.HttpServlet.service(HttpServlet.java:717)

org.cnamts.securite.filtres.FiltreSecurite.doFilter(FiltreSecurite.java:133)
org.cnamts.securite.filtres.FiltreCommun.doFilter(FiltreCommun.java:128)


I'm using tomcat 6.0.29 with java jdk 1.6 and netbeans 6.9. My jdbc
connector jar is mysql-connector-java-5.1.13-bin.jar, placed in tomcat lib
path.

The declaration of my ressource in web.xml is:

DB Connection
jdbc/connData
javax.sql.DataSource
Container

in my context.xml file:




Others methods for retrieve or update data works well. I've only a problem
with isValid.
What is wrong, or is there any other solution for checking my connection ?

Thanks a lot for your help.

Emmanuel
-- 
View this message in context: 
http://old.nabble.com/Tomcat-6---Mysql-with-connection-Pool--Error-isValid-Method-tp30306398p30306398.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



DO NOT REPLY [Bug 49598] Session update fails and adds second cookie header without header name

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49598

Mark Thomas  changed:

   What|Removed |Added

 Status|REOPENED|RESOLVED
 Resolution||FIXED

--- Comment #5 from Mark Thomas  2010-11-25 10:42:46 EST ---
This issue has been fixed in 6.0.29.

If you are experiencing issues, Bugzilla is not a support forum. Please use the
users mailing list.

-- 
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



DO NOT REPLY [Bug 50338] Undeploy: files deleted before application's destroy() finishes

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50338

Konstantin Kolinko  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution||INVALID

--- Comment #1 from Konstantin Kolinko  2010-11-25 
10:41:23 EST ---
> Identified as Tomcat deleting app's files too early.

You wrote that you are deleting the files. You cannot load a class from you
hard drive if you have already deleted it from there.

If you need help troubleshooting this, please ask on the users@ list.

-- 
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



DO NOT REPLY [Bug 50338] New: Undeploy: files deleted before application's destroy() finishes

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=50338

   Summary: Undeploy: files deleted before application's destroy()
finishes
   Product: Tomcat 6
   Version: 6.0.29
  Platform: PC
OS/Version: All
Status: NEW
  Severity: normal
  Priority: P2
 Component: Catalina
AssignedTo: dev@tomcat.apache.org
ReportedBy: on...@dynawest.cz


Sun JDK 1.6.22
Gentoo
Wicket 1.4.13

STR:

1) Have a Wicket-based application deployed on Tomcat, exploded to a dir
2) Undeploy it by moving the directory elsewhere
3) You'll see the exception 
   NoClassDefFoundError: org/apache/wicket/util/lang/PropertyResolver
   See
http://ondra.zizka.cz/stranky/programovani/java/web/wicket/wicket-NoClassDefFoundError-PropertyResolver.texy
for full stacktrace

Using Jetty, this error does not occur, so it's Tomcat related.

The issue is discussed here:
http://www.mail-archive.com/us...@wicket.apache.org/msg49863.html

Identified as Tomcat deleting app's files too early.

-- 
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



DO NOT REPLY [Bug 49598] Session update fails and adds second cookie header without header name

2010-11-25 Thread bugzilla
https://issues.apache.org/bugzilla/show_bug.cgi?id=49598

tetsu...@interfree.it changed:

   What|Removed |Added

 Status|RESOLVED|REOPENED
Version|6.0.28  |6.0.29
 Resolution|FIXED   |

--- Comment #4 from tetsu...@interfree.it 2010-11-25 10:23:09 EST ---
The same issue happens even on Tomcat 6.0.29 on both Linux CentOS and Windows
XP with exactly the same behaviour. We discovered that migrating from Tomcat
6.0.18

Does there exists a temporary fix ?

-- 
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: r1039056 - /tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 14:21:52 2010
New Revision: 1039056

URL: http://svn.apache.org/viewvc?rev=1039056&view=rev
Log:
Make method name consistent with class name

Modified:
tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java

Modified: tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java?rev=1039056&r1=1039055&r2=1039056&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/loader/WebappClassLoader.java Thu Nov 
25 14:21:52 2010
@@ -2425,7 +2425,7 @@ public class WebappClassLoader
 // Check the key
 Object key = ((Reference) table[j]).get();
 if (this.equals(key) ||
-isLoadedByThisWebAppClassLoader(key)) {
+isLoadedByThisWebappClassLoader(key)) {
 remove = true;
 }
 // Check the value
@@ -2434,7 +2434,7 @@ public class WebappClassLoader
 valueField.setAccessible(true);
 Object value = valueField.get(table[j]);
 if (this.equals(value) ||
-isLoadedByThisWebAppClassLoader(value)) {
+isLoadedByThisWebappClassLoader(value)) {
 remove = true;
 }
 if (remove) {
@@ -2516,7 +2516,7 @@ public class WebappClassLoader
  * @return true if o has been loaded by the current 
classloader
  * or one of its descendants.
  */
-private boolean isLoadedByThisWebAppClassLoader(Object o) {
+private boolean isLoadedByThisWebappClassLoader(Object o) {
 if (o == null) {
 return false;
 }



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



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

2010-11-25 Thread kkolinko
Author: kkolinko
Date: Thu Nov 25 14:19:48 2010
New Revision: 1039054

URL: http://svn.apache.org/viewvc?rev=1039054&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=1039054&r1=1039053&r2=1039054&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 14:19:48 2010
@@ -280,5 +280,7 @@ PATCHES PROPOSED TO BACKPORT:
   JSP class loaders
   Patch by Sylvain Laurent
   https://issues.apache.org/bugzilla/attachment.cgi?id=25116
-  +1: markt
+  +1: markt, kkolinko
   -1:
+kkolinko: I'd like to 
s/isLoadedByThisWebAppClassLoader/isLoadedByThisWebappClassLoader/
+to match this class name. Also do not change JavaDoc at class declaration.



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



svn commit: r1039051 - in /tomcat/trunk: java/org/apache/catalina/ha/session/DeltaManager.java webapps/docs/changelog.xml

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 14:12:24 2010
New Revision: 1039051

URL: http://svn.apache.org/viewvc?rev=1039051&view=rev
Log:
Fix a couple of clustering issues:
 - Don't try and obtain session data from the cluster if the current node is 
the only node in the cluster.
 - Log requesting session data as INFO rather than WARNING.

Modified:
tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java?rev=1039051&r1=1039050&r2=1039051&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/ha/session/DeltaManager.java Thu Nov 
25 14:12:24 2010
@@ -802,7 +802,7 @@ public CatalinaCluster getCluster() {
  * @see #findSessionMasterMember()
  */
 public synchronized void getAllClusterSessions() {
-if (cluster != null && cluster.getMembers().length > 0) {
+if (cluster != null && cluster.getMembers().length > 1) {
 long beforeSendTime = System.currentTimeMillis();
 Member mbr = findSessionMasterMember();
 if(mbr == null) { // No domain member found
@@ -820,8 +820,8 @@ public CatalinaCluster getCluster() {
  receiverQueue = true ;
 }
 cluster.send(msg, mbr);
-if (log.isWarnEnabled())
-
log.warn(sm.getString("deltaManager.waitForSessionState",getName(), mbr, 
Integer.valueOf(getStateTransferTimeout(;
+if (log.isInfoEnabled())
+
log.info(sm.getString("deltaManager.waitForSessionState",getName(), mbr, 
Integer.valueOf(getStateTransferTimeout(;
 // FIXME At sender ack mode this method check only the state 
transfer and resend is a problem!
 waitForSendAllSessions(beforeSendTime);
 } finally {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1039051&r1=1039050&r2=1039051&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 25 14:12:24 2010
@@ -70,6 +70,11 @@
 50185: Add additional trace level logging to Tribes to 
assist
 with fault diagnosis. Based on a patch by Ariel. (markt)
   
+  
+Don't try and obtain session data from the cluster if the current
+node is the only node in the cluster. Log requesting session data as
+INFO rather than WARNING. (markt)
+  
 
   
   



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



svn commit: r1039047 - in /tomcat: tc5.5.x/trunk/STATUS.txt tc6.0.x/trunk/STATUS.txt

2010-11-25 Thread kkolinko
Author: kkolinko
Date: Thu Nov 25 14:06:53 2010
New Revision: 1039047

URL: http://svn.apache.org/viewvc?rev=1039047&view=rev
Log:
ack that additional patch is required

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

Modified: tomcat/tc5.5.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc5.5.x/trunk/STATUS.txt?rev=1039047&r1=1039046&r2=1039047&view=diff
==
--- tomcat/tc5.5.x/trunk/STATUS.txt (original)
+++ tomcat/tc5.5.x/trunk/STATUS.txt Thu Nov 25 14:06:53 2010
@@ -76,7 +76,7 @@ PATCHES PROPOSED TO BACKPORT:
this patched tc5.5 version on top of it:

http://people.apache.org/~kkolinko/patches/2010-11-15_tc55_tomcat-nsi-of-tc7_vs_tc55.diff
   )
-   +1: kkolinko
+   +1: kkolinko - with r1038975 to remove use of PID file
-1:
 
 * Configure manager, host-manager and admin webapps to use HttpOnly for 
session cookies

Modified: tomcat/tc6.0.x/trunk/STATUS.txt
URL: 
http://svn.apache.org/viewvc/tomcat/tc6.0.x/trunk/STATUS.txt?rev=1039047&r1=1039046&r2=1039047&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 14:06:53 2010
@@ -221,8 +221,7 @@ PATCHES PROPOSED TO BACKPORT:
this patched tc6 version on top of it:

http://people.apache.org/~kkolinko/patches/2010-11-15_tc6_tomcat-nsi-of-tc7_vs_tc6.diff
   )
-   +1: kkolinko
-   +1: markt - with r1038975 to remove use of PID file
+   +1: kkolinko, markt - with r1038975 to remove use of PID file
-1: 
 
 * Backport JSP unloading patch (BZ48358).



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



Re: [ANN] New Tomcat committer: Christopher Schultz (schultz)

2010-11-25 Thread Rainer Jung

On 22.11.2010 20:16, Mark Thomas wrote:

On behalf of the Tomcat committers I am pleased to announce that
Christopher Schultz (schultz) has been voted in as a new Tomcat committer.

Please join me in welcoming him.


Congrats! Keep up the good work.

Rainer

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



svn commit: r1038981 - in /tomcat/trunk: java/org/apache/catalina/manager/HTMLManagerServlet.java webapps/docs/changelog.xml

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 10:19:33 2010
New Revision: 1038981

URL: http://svn.apache.org/viewvc?rev=1038981&view=rev
Log:
Correctly validate context path so sessions can be viewed for ROOT webapp

Modified:
tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java?rev=1038981&r1=1038980&r2=1038981&view=diff
==
--- tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/manager/HTMLManagerServlet.java Thu 
Nov 25 10:19:33 2010
@@ -868,7 +868,7 @@ public final class HTMLManagerServlet ex
 
 protected List getSessionsForName(ContextName cn,
 StringManager smClient) {
-if ((cn == null) || (!cn.getPath().startsWith("/") &&
+if ((cn == null) || !(cn.getPath().startsWith("/") ||
 cn.getPath().equals(""))) {
 String path = null;
 if (cn != null) {
@@ -905,7 +905,7 @@ public final class HTMLManagerServlet ex
 }
 protected Session getSessionForNameAndId(ContextName cn, String id,
 StringManager smClient) throws IOException {
-if ((cn == null) || (!cn.getPath().startsWith("/") &&
+if ((cn == null) || !(cn.getPath().startsWith("/") ||
 cn.getPath().equals(""))) {
 String path = null;
 if (cn != null) {

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038981&r1=1038980&r2=1038981&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 25 10:19:33 2010
@@ -78,6 +78,10 @@
 50294: Add more information to documentation regarding 
format
 of configuration files. Patch provided by Luke Meyer. (markt) 
   
+  
+Correct validate provided context path so sessions for the ROOT web
+application can be viewed through the HTML Manager. (markt)
+  
 
   
   



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



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

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 10:10:42 2010
New Revision: 1038979

URL: http://svn.apache.org/viewvc?rev=1038979&view=rev
Log:
Update vote after testing

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=1038979&r1=1038978&r2=1038979&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 10:10:42 2010
@@ -222,9 +222,8 @@ PATCHES PROPOSED TO BACKPORT:

http://people.apache.org/~kkolinko/patches/2010-11-15_tc6_tomcat-nsi-of-tc7_vs_tc6.diff
   )
+1: kkolinko
-   -1: markt - I found an issue with using a PID file in 7.0.x that prevents 
the
-   service from starting (a second attempt succeeds). I am assuming
-   6.0.x will also be affected. 
+   +1: markt - with r1038975 to remove use of PID file
+   -1: 
 
 * Backport JSP unloading patch (BZ48358).
   The patch has substantially changed since the original version.



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



svn commit: r1038978 - /tomcat/trunk/webapps/docs/changelog.xml

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 10:10:31 2010
New Revision: 1038978

URL: http://svn.apache.org/viewvc?rev=1038978&view=rev
Log:
Update changelog

Modified:
tomcat/trunk/webapps/docs/changelog.xml

Modified: tomcat/trunk/webapps/docs/changelog.xml
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/webapps/docs/changelog.xml?rev=1038978&r1=1038977&r2=1038978&view=diff
==
--- tomcat/trunk/webapps/docs/changelog.xml (original)
+++ tomcat/trunk/webapps/docs/changelog.xml Thu Nov 25 10:10:31 2010
@@ -80,6 +80,15 @@
   
 
   
+  
+
+  
+Don't configure Windows installer to use PID file since it is not
+removed when the service stops which prevents the service from 
starting.
+(markt)
+  
+
+  
 
 
   



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



svn commit: r1038975 - /tomcat/trunk/res/tomcat.nsi

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 10:05:02 2010
New Revision: 1038975

URL: http://svn.apache.org/viewvc?rev=1038975&view=rev
Log:
Don't use pid file. It is not removed on service stop and prevents the next 
service start.
https://issues.apache.org/jira/browse/DAEMON-188 has been raised for this issue.

Modified:
tomcat/trunk/res/tomcat.nsi

Modified: tomcat/trunk/res/tomcat.nsi
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/res/tomcat.nsi?rev=1038975&r1=1038974&r2=1038975&view=diff
==
--- tomcat/trunk/res/tomcat.nsi (original)
+++ tomcat/trunk/res/tomcat.nsi Thu Nov 25 10:05:02 2010
@@ -307,7 +307,7 @@ Section -post
 FileWrite $ServiceInstallLog "$\r$\n"
 FileWrite $ServiceInstallLog '"$instdir\bin\tom...@version_major@.exe" 
//US//tom...@version_major@ --JvmOptions 
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
 FileWrite $ServiceInstallLog "$\r$\n"
-FileWrite $ServiceInstallLog '"$instdir\bin\tom...@version_major@.exe" 
//US//tom...@version_major@ --StdOutput auto --StdError auto --PidFile 
tom...@version_major@.pid'
+FileWrite $ServiceInstallLog '"$instdir\bin\tom...@version_major@.exe" 
//US//tom...@version_major@ --StdOutput auto --StdError auto'
 FileWrite $ServiceInstallLog "$\r$\n"
 FileClose $ServiceInstallLog
   ${EndIf}
@@ -315,7 +315,7 @@ Section -post
   DetailPrint "Configuring tom...@version_major@ service"
   nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" 
//US//tom...@version_major@ --Classpath 
"$INSTDIR\bin\bootstrap.jar;$INSTDIR\bin\tomcat-juli.jar" --StartClass 
org.apache.catalina.startup.Bootstrap --StopClass 
org.apache.catalina.startup.Bootstrap --StartParams start --StopParams stop  
--StartMode jvm --StopMode jvm'
   nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" 
//US//tom...@version_major@ --JvmOptions 
"-Dcatalina.home=$INSTDIR#-Dcatalina.base=$INSTDIR#-Djava.endorsed.dirs=$INSTDIR\endorsed#-Djava.io.tmpdir=$INSTDIR\temp#-Djava.util.logging.manager=org.apache.juli.ClassLoaderLogManager#-Djava.util.logging.config.file=$INSTDIR\conf\logging.properties"'
-  nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" 
//US//tom...@version_major@ --StdOutput auto --StdError auto --PidFile 
tom...@version_major@.pid'
+  nsExec::ExecToLog '"$instdir\bin\tom...@version_major@.exe" 
//US//tom...@version_major@ --StdOutput auto --StdError auto'
 
   WriteUninstaller "$INSTDIR\Uninstall.exe"
 



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



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

2010-11-25 Thread markt
Author: markt
Date: Thu Nov 25 09:51:15 2010
New Revision: 1038973

URL: http://svn.apache.org/viewvc?rev=1038973&view=rev
Log:
Change vote as a result of more detailed testing

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=1038973&r1=1038972&r2=1038973&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 09:51:15 2010
@@ -221,8 +221,10 @@ PATCHES PROPOSED TO BACKPORT:
this patched tc6 version on top of it:

http://people.apache.org/~kkolinko/patches/2010-11-15_tc6_tomcat-nsi-of-tc7_vs_tc6.diff
   )
-   +1: kkolinko, markt
-   -1:
+   +1: kkolinko
+   -1: markt - I found an issue with using a PID file in 7.0.x that prevents 
the
+   service from starting (a second attempt succeeds). I am assuming
+   6.0.x will also be affected. 
 
 * Backport JSP unloading patch (BZ48358).
   The patch has substantially changed since the original version.



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



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

2010-11-25 Thread jfclere
Author: jfclere
Date: Thu Nov 25 09:46:05 2010
New Revision: 1038969

URL: http://svn.apache.org/viewvc?rev=1038969&view=rev
Log:
My 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=1038969&r1=1038968&r2=1038969&view=diff
==
--- tomcat/tc6.0.x/trunk/STATUS.txt (original)
+++ tomcat/tc6.0.x/trunk/STATUS.txt Thu Nov 25 09:46:05 2010
@@ -49,7 +49,7 @@ PATCHES PROPOSED TO BACKPORT:
   Truststores don't have to have passwords
   Based on a patch by 'smmwpf54'
   https://issues.apache.org/bugzilla/attachment.cgi?id=26268
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Configure Tomcat to use HttpOnly for session cookies by default
@@ -93,7 +93,7 @@ PATCHES PROPOSED TO BACKPORT:
   http://svn.apache.org/viewvc?rev=1003461&view=rev
   http://svn.apache.org/viewvc?rev=1033415&view=rev
   Note: Don't change return type for parseEndChunk(), just return true.
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1:
   kkolinko: Only if accompanied by a patch that sets limit on the maximum
   size of ChunkedInputFilter.trailingHeaders buffer. I am proposing such a
@@ -101,12 +101,12 @@ PATCHES PROPOSED TO BACKPORT:
 
   kkolinko: Additional patch:
   http://svn.apache.org/viewvc?rev=1033842&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
   kkolinko: Patch to impose limit on the trailers length:
   http://svn.apache.org/viewvc?rev=1037924&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
@@ -157,7 +157,7 @@ PATCHES PROPOSED TO BACKPORT:
   work better in an embedded environment.
   Patch provided by Christopher Schultz.
   http://svn.apache.org/viewvc?rev=1033448&view=rev
-  +1: kkolinko, markt
+  +1: kkolinko, markt, jfclere
   -1:
 
 * Backport Windows installer improvements from Tomcat 7.0.5.
@@ -244,7 +244,7 @@ PATCHES PROPOSED TO BACKPORT:
   Provide a workaround for an HP-UX issue that can result in large numbers of
   SEVERE log messages appearing in the logs as a result of normal operation.
   http://svn.apache.org/viewvc?rev=1037715&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50228
@@ -272,7 +272,7 @@ PATCHES PROPOSED TO BACKPORT:
 * Make memory leak prevention code that clears ThreadLocal instances more 
robust
   against objects with toString() methods that throw exceptions.
   http://svn.apache.org/viewvc?rev=1038041&view=rev
-  +1: markt, kkolinko
+  +1: markt, kkolinko, jfclere
   -1:
 
 * Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48837



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



Re: svn commit: r1038717 - in /tomcat/tc7.0.x/tags/TOMCAT_7_0_5: ./ java/org/apache/catalina/core/ java/org/apache/catalina/startup/

2010-11-25 Thread Mark Thomas
On 24/11/2010 22:59, Konstantin Kolinko wrote:
> 2010/11/24  :
>> Author: markt
>> Date: Wed Nov 24 17:41:29 2010
>> New Revision: 1038717
>>
>> URL: http://svn.apache.org/viewvc?rev=1038717&view=rev
>> Log:
>> Tag Tomcat 7.0.5
> FYI:
> It is recommended to perform "svn up" before making a WC->URL copy.
> The above mentioned files have rev. later than their parent.
> I do not say that anything is broken. It just might be an
> inconvenience. This tag actually matches r1038713, not r1038654.

ACK. Noted for future reference.

As long as the source tarball matches the tag (I'll be running that
check later today) all should be OK.

Mark

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



[Tomcat Wiki] Trivial Update of "FAQ/Troubleshooting_an d_Diagnostics" by PidSter

2010-11-25 Thread Apache Wiki
Dear Wiki user,

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

The "FAQ/Troubleshooting_and_Diagnostics" page has been changed by PidSter.
http://wiki.apache.org/tomcat/FAQ/Troubleshooting_and_Diagnostics?action=diff&rev1=9&rev2=10

--

  
  == Techniques & Reference ==
   * [[HowTo#How_do_I_obtain_a_thread_dump_of_my_running_webapp_.3F| How To: 
Capture a thread dump]]
-  * Capturing a heap dump
-  * Examining a Stacktrace
+  * [[HowTo#How_do_I_obtain_a_heap_dump.3F| How To: Capture a heap dump]]
+  * [[HowTo#How_do_I_read_a_stack_trace.3F| How To: Examine a Stacktrace]]
   * [[HowTo#How_do_I_debug_a_Tomcat_application.3F| How To: Configure Tomcat 
for debugging]]
   * [[FAQ/Memory| FAQ: Memory]]
   * [[MemoryLeakProtection| Tomcat Memory Leak Protection]]
@@ -24, +24 @@

   * 
[[http://download.oracle.com/javase/6/docs/technotes/tools/share/jmap.html| 
jmap - Dumps heap and shows heap status]]
   * 
[[http://download.oracle.com/javase/6/docs/technotes/tools/share/jhat.html| 
jhat - Heap Analyzer Tool]]
  
- === Profilers ===
+ === Profilers & Heap Analyzers ===
   * [[http://www.eclipse.org/mat/| Eclipse Memory Analyzer (MAT)]]
   * [[http://www.yourkit.com/| YourKit Profiler]]
   * [[http://www.quest.com/jprobe/| JProbe| ]]

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