tomcat7.0
14 years agoDetect incomplete AJP messages and reject the associated request if one is found
markt [Thu, 25 Aug 2011 10:38:32 +0000 (10:38 +0000)]
Detect incomplete AJP messages and reject the associated request if one is found

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1161486 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFollowup to r1161322.
kkolinko [Thu, 25 Aug 2011 00:25:33 +0000 (00:25 +0000)]
Followup to r1161322.
Do not pass exception to message template, because exception itself is logged as well.
Remove argument from message templates that is never passed.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1161339 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51713
kkolinko [Wed, 24 Aug 2011 23:46:50 +0000 (23:46 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51713
Improve message that is logged if there is a typo in the value of protocol in a <Connector> element.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1161322 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a message)
kkolinko [Wed, 24 Aug 2011 22:45:00 +0000 (22:45 +0000)]
Fix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a message)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1161310 13f79535-47bb-0310-9956-ffa450edef68

14 years agoForward-port r1159673 and r1159680 from tc7.0.x
kkolinko [Wed, 24 Aug 2011 22:25:03 +0000 (22:25 +0000)]
Forward-port r1159673 and r1159680 from tc7.0.x
Fixes http://issues.apache.org/bugzilla/show_bug.cgi?id=51688
JreMemoryLeakPreventionListener now protects against AWT thread creation. (schultz)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1161303 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd the ability to swallow input by specifying a null chunk
markt [Tue, 23 Aug 2011 16:22:03 +0000 (16:22 +0000)]
Add the ability to swallow input by specifying a null chunk

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160776 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd ability to track bytes read
markt [Tue, 23 Aug 2011 16:20:42 +0000 (16:20 +0000)]
Add ability to track bytes read

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160774 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRename
markt [Tue, 23 Aug 2011 16:17:20 +0000 (16:17 +0000)]
Rename

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160772 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPull up refillReadBuffer()
markt [Tue, 23 Aug 2011 14:50:27 +0000 (14:50 +0000)]
Pull up refillReadBuffer()

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160721 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRe-order. No functional change.
markt [Tue, 23 Aug 2011 14:47:50 +0000 (14:47 +0000)]
Re-order. No functional change.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160720 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPull up finish() so output() is used consistently to wrote closing message
markt [Tue, 23 Aug 2011 12:19:20 +0000 (12:19 +0000)]
Pull up finish() so output() is used consistently to wrote closing message

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160652 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPull up flush()
markt [Tue, 23 Aug 2011 11:40:05 +0000 (11:40 +0000)]
Pull up flush()
APR (like BIO and NIO) now writes each AJP packet to the socket as soon as it is ready

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160639 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPull up AJP SocketOutputBuffer
markt [Tue, 23 Aug 2011 11:07:29 +0000 (11:07 +0000)]
Pull up AJP SocketOutputBuffer

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160626 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRename since this message is used for response headers and response body
markt [Tue, 23 Aug 2011 11:00:02 +0000 (11:00 +0000)]
Rename since this message is used for response headers and response body

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160619 13f79535-47bb-0310-9956-ffa450edef68

14 years agoOrganise code. No functional change.
markt [Tue, 23 Aug 2011 10:41:02 +0000 (10:41 +0000)]
Organise code. No functional change.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160611 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unnecessary (duplicate) code
markt [Tue, 23 Aug 2011 09:17:59 +0000 (09:17 +0000)]
Remove unnecessary (duplicate) code

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160592 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove deprecated code for Tomcat 8
markt [Mon, 22 Aug 2011 17:56:32 +0000 (17:56 +0000)]
Remove deprecated code for Tomcat 8

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160348 13f79535-47bb-0310-9956-ffa450edef68

14 years agoEnsure AjpMessage header is correct for the direction in which the message is being...
markt [Mon, 22 Aug 2011 17:55:14 +0000 (17:55 +0000)]
Ensure AjpMessage header is correct for the direction in which the message is being sent

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160347 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCorrect comment
markt [Mon, 22 Aug 2011 17:23:12 +0000 (17:23 +0000)]
Correct comment

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1160343 13f79535-47bb-0310-9956-ffa450edef68

14 years agoComment typo
markt [Tue, 16 Aug 2011 20:40:23 +0000 (20:40 +0000)]
Comment typo

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158437 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49683
markt [Tue, 16 Aug 2011 19:28:06 +0000 (19:28 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49683
Use separate timeouts for socket  Timeout and keep-alive timeout

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158426 13f79535-47bb-0310-9956-ffa450edef68

14 years agoTimeouts are ints
markt [Tue, 16 Aug 2011 15:52:19 +0000 (15:52 +0000)]
Timeouts are ints

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158335 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused method
markt [Tue, 16 Aug 2011 15:51:49 +0000 (15:51 +0000)]
Remove unused method

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158334 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAlign keep-alive disable capability across all HTTP processors
markt [Tue, 16 Aug 2011 15:45:46 +0000 (15:45 +0000)]
Align keep-alive disable capability across all HTTP processors

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158331 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAlign keep-alive count tracking for HTTP
markt [Tue, 16 Aug 2011 12:19:49 +0000 (12:19 +0000)]
Align keep-alive count tracking for HTTP

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158227 13f79535-47bb-0310-9956-ffa450edef68

14 years agoMake handling of keep-alive timeout consistent
markt [Tue, 16 Aug 2011 11:12:13 +0000 (11:12 +0000)]
Make handling of keep-alive timeout consistent
No need for local variable, processor has the keep-alive timeout

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158199 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix generics warnings
markt [Tue, 16 Aug 2011 11:11:31 +0000 (11:11 +0000)]
Fix generics warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158198 13f79535-47bb-0310-9956-ffa450edef68

14 years agoNo need for local variable, processor already has the keep-alive timeout
markt [Tue, 16 Aug 2011 11:02:08 +0000 (11:02 +0000)]
No need for local variable, processor already has the keep-alive timeout

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158195 13f79535-47bb-0310-9956-ffa450edef68

14 years agonOnce -> nonce for consistency
markt [Tue, 16 Aug 2011 10:03:00 +0000 (10:03 +0000)]
nOnce -> nonce for consistency

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158176 13f79535-47bb-0310-9956-ffa450edef68

14 years agoBIO doesn't use comet but align code with NIO/APR.
markt [Tue, 16 Aug 2011 09:06:22 +0000 (09:06 +0000)]
BIO doesn't use comet but align code with NIO/APR.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158160 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51658
markt [Tue, 16 Aug 2011 08:46:07 +0000 (08:46 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51658
Fix copy/paste error that could trigger an NPE.
Based on a suggestion by Felix Schumacher

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1158155 13f79535-47bb-0310-9956-ffa450edef68

14 years agoClean-up I do not intend to back-port (non-critical and changes the Host API)
markt [Mon, 15 Aug 2011 18:50:25 +0000 (18:50 +0000)]
Clean-up I do not intend to back-port (non-critical and changes the Host API)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157943 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51654
markt [Mon, 15 Aug 2011 18:38:16 +0000 (18:38 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51654
Log an error message if an appBase is specified that is not a directory and disable automatic deployment to prevent subsequent errors.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157939 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix benchmark tests
markt [Mon, 15 Aug 2011 16:53:42 +0000 (16:53 +0000)]
Fix benchmark tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157908 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51583
fhanik [Mon, 15 Aug 2011 15:06:35 +0000 (15:06 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51583

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157874 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused method
markt [Mon, 15 Aug 2011 14:25:05 +0000 (14:25 +0000)]
Remove unused method

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157860 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAlso seeing similar failures with NIO & APR
markt [Mon, 15 Aug 2011 13:52:18 +0000 (13:52 +0000)]
Also seeing similar failures with NIO & APR

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157847 13f79535-47bb-0310-9956-ffa450edef68

14 years agoBetter fix for timing issues on Linux with unit tests
markt [Mon, 15 Aug 2011 13:14:12 +0000 (13:14 +0000)]
Better fix for timing issues on Linux with unit tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157834 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAttempt to fix timing issues on Linux unit tests
markt [Mon, 15 Aug 2011 13:03:34 +0000 (13:03 +0000)]
Attempt to fix timing issues on Linux unit tests

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157832 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653
markt [Mon, 15 Aug 2011 12:29:58 +0000 (12:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653
Move custom error handling from Host to Context.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157810 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAlign OutputBuffer initialisation across the connectors
markt [Fri, 12 Aug 2011 18:24:21 +0000 (18:24 +0000)]
Align OutputBuffer initialisation across the connectors
Reduce visibility of properties and methods

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157204 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAlign InputBuffer initialisation across the connectors
markt [Fri, 12 Aug 2011 17:59:22 +0000 (17:59 +0000)]
Align InputBuffer initialisation across the connectors
Remove unused code
Reduce visibility of properties and methods

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157198 13f79535-47bb-0310-9956-ffa450edef68

14 years agoremove file not needed anymore
fhanik [Fri, 12 Aug 2011 15:40:01 +0000 (15:40 +0000)]
remove file not needed anymore

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157161 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPush down inputStream as it is only used by BIO
markt [Fri, 12 Aug 2011 15:17:50 +0000 (15:17 +0000)]
Push down inputStream as it is only used by BIO

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157151 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51650
markt [Fri, 12 Aug 2011 09:09:32 +0000 (09:09 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51650
Code clean-up

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157018 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51649
markt [Fri, 12 Aug 2011 09:00:24 +0000 (09:00 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51649
Document ThreadLocalLeakPreventionListener

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1157015 13f79535-47bb-0310-9956-ffa450edef68

14 years agoDocument two new compiler warnings added in Eclipse 3.7 Indigo.
kkolinko [Thu, 11 Aug 2011 13:17:20 +0000 (13:17 +0000)]
Document two new compiler warnings added in Eclipse 3.7 Indigo.
These could be Warnings, but more experience is needed first. "Ignore" are their default values.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156608 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFollow up to r1156530. Filter URL (mainly in case of &).
markt [Thu, 11 Aug 2011 12:46:27 +0000 (12:46 +0000)]
Follow up to r1156530. Filter URL (mainly in case of &).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156602 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=41718
markt [Thu, 11 Aug 2011 08:13:56 +0000 (08:13 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41718
RFC2616 says redirects should include a response body.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156530 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUnregisters MBean of DataSource when web application stops.
kfujino [Thu, 11 Aug 2011 07:39:44 +0000 (07:39 +0000)]
Unregisters MBean of DataSource when web application stops.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156519 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=41673
markt [Wed, 10 Aug 2011 18:37:56 +0000 (18:37 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41673
Use platform line endings when reporting error messages

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156304 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51644
markt [Wed, 10 Aug 2011 17:57:25 +0000 (17:57 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51644
Annotation scanning was broken for contexts with a multi-level context path such as /a/b

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156276 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unnecessary svn:mergeinfo properties
markt [Wed, 10 Aug 2011 13:33:59 +0000 (13:33 +0000)]
Remove unnecessary svn:mergeinfo properties

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156174 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640
markt [Wed, 10 Aug 2011 13:22:52 +0000 (13:22 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640
Improve memory leak protection for DriverManager

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156171 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51641
markt [Wed, 10 Aug 2011 11:43:09 +0000 (11:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51641
Connections map uses NioChannel, not <SocketWrapper<NioChannel>

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1156115 13f79535-47bb-0310-9956-ffa450edef68

14 years agoIdeas for Tomcat 8
markt [Tue, 9 Aug 2011 15:41:09 +0000 (15:41 +0000)]
Ideas for Tomcat 8

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155408 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPrep the changelog
markt [Tue, 9 Aug 2011 15:36:44 +0000 (15:36 +0000)]
Prep the changelog

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155406 13f79535-47bb-0310-9956-ffa450edef68

14 years agoMissed a version change
markt [Tue, 9 Aug 2011 15:25:46 +0000 (15:25 +0000)]
Missed a version change

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155400 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate the same Eclipse files
markt [Tue, 9 Aug 2011 15:22:38 +0000 (15:22 +0000)]
Update the same Eclipse files

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155398 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate Maven release versions
markt [Tue, 9 Aug 2011 15:21:59 +0000 (15:21 +0000)]
Update Maven release versions

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155397 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove some old info.
markt [Tue, 9 Aug 2011 15:21:14 +0000 (15:21 +0000)]
Remove some old info.
Update the change log info.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155395 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate version numbers to 8.0.x
markt [Tue, 9 Aug 2011 15:18:58 +0000 (15:18 +0000)]
Update version numbers to 8.0.x

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155393 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate post tag
markt [Tue, 9 Aug 2011 08:28:18 +0000 (08:28 +0000)]
Update post tag

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1155257 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpadte to 1.1.22 of the native connector
markt [Mon, 8 Aug 2011 10:42:49 +0000 (10:42 +0000)]
Upadte to 1.1.22 of the native connector

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154911 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd missing getter and setter for the alwaysUseSession attribute of the authenticators.
markt [Mon, 8 Aug 2011 10:20:40 +0000 (10:20 +0000)]
Add missing getter and setter for the alwaysUseSession attribute of the authenticators.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154902 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCorrectly indicate if socket is closing when calling recycle for the AJP NIO processo...
markt [Mon, 8 Aug 2011 09:57:05 +0000 (09:57 +0000)]
Correctly indicate if socket is closing when calling recycle for the AJP NIO processor. Note since the flag is unused in this case there were no bugs triggered by the re-factoring error. (rjung)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154897 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCorrectly nest locks and unlocks to resolve FindBugs warning
markt [Sun, 7 Aug 2011 10:47:38 +0000 (10:47 +0000)]
Correctly nest locks and unlocks to resolve FindBugs warning

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154691 13f79535-47bb-0310-9956-ffa450edef68

14 years agoOnly try and create the dir if it doesn't already exist
markt [Sun, 7 Aug 2011 10:37:16 +0000 (10:37 +0000)]
Only try and create the dir if it doesn't already exist

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154689 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRename socket -> socketWrapper
markt [Sat, 6 Aug 2011 20:58:51 +0000 (20:58 +0000)]
Rename socket -> socketWrapper

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154586 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAlign HTTP NIO with BIO and APR and hold a reference to the socket wrapper not the...
markt [Sat, 6 Aug 2011 20:56:54 +0000 (20:56 +0000)]
Align HTTP NIO with BIO and APR and hold a reference to the socket wrapper not the raw socket in the Processor.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154584 13f79535-47bb-0310-9956-ffa450edef68

14 years agoStart to align process method
markt [Sat, 6 Aug 2011 20:49:52 +0000 (20:49 +0000)]
Start to align process method

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154583 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix some false npe warnings
markt [Sat, 6 Aug 2011 20:28:35 +0000 (20:28 +0000)]
Fix some false npe warnings

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154579 13f79535-47bb-0310-9956-ffa450edef68

14 years agoMissing @Override markers
markt [Sat, 6 Aug 2011 20:19:29 +0000 (20:19 +0000)]
Missing @Override markers

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154575 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix a small number of warnings reported by FindBugs.
markt [Sat, 6 Aug 2011 20:00:39 +0000 (20:00 +0000)]
Fix a small number of warnings reported by FindBugs.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154574 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove error message since a) it is provides very little / no useful information...
markt [Sat, 6 Aug 2011 19:24:49 +0000 (19:24 +0000)]
Remove error message since a) it is provides very little / no useful information and b) writing to stderr is just plain wrong.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154571 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51621
markt [Fri, 5 Aug 2011 18:08:53 +0000 (18:08 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51621
Add additional required JARs to the deployer distribution.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154330 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51615
markt [Fri, 5 Aug 2011 17:17:48 +0000 (17:17 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51615
Code clean-up.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154321 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPrevent spurious log warnings on container stop if a child component has previously...
markt [Fri, 5 Aug 2011 16:31:41 +0000 (16:31 +0000)]
Prevent spurious log warnings on container stop if a child component has previously failed.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154298 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51610
markt [Fri, 5 Aug 2011 16:29:58 +0000 (16:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51610
Make lifecycle transitions more robust at handling unchecked exceptions

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154297 13f79535-47bb-0310-9956-ffa450edef68

14 years agoExpand description
markt [Fri, 5 Aug 2011 16:26:21 +0000 (16:26 +0000)]
Expand description

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1154296 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51614
kfujino [Thu, 4 Aug 2011 11:45:53 +0000 (11:45 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51614
Avoid two times calls of store.load() and session.expire() in PersistentManager.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153854 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAllow to have several AccessLogValve instances in the same scope (e.g. in the same...
kkolinko [Thu, 4 Aug 2011 04:01:23 +0000 (04:01 +0000)]
Allow to have several AccessLogValve instances in the same scope (e.g. in the same Context).

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153745 13f79535-47bb-0310-9956-ffa450edef68

14 years agoSplit "condition" attribute of AccessLogValve into two, "conditionIf" and "conditionU...
kkolinko [Thu, 4 Aug 2011 03:53:27 +0000 (03:53 +0000)]
Split "condition" attribute of AccessLogValve into two, "conditionIf" and "conditionUnless".
Implement conditional logging that logs only if a request attribute is present.
The old attribute "condition" is provided as well, for backwards compatibility, and is equal to "conditionUnless".

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153742 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate logging documentation
kkolinko [Wed, 3 Aug 2011 22:57:35 +0000 (22:57 +0000)]
Update logging documentation
1. Place a better note that Log4J configuration is not needed if it is only osed by one's webapp.
2. Rearrange Log4J configuration section and document how configure it to be used by a single CATALINA_BASE only.
3. Add "productive usage considerations" subsection to JULI one.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153696 13f79535-47bb-0310-9956-ffa450edef68

14 years agoExplicitly configure what icon is used with Tomcat in the list of uninstallable progr...
kkolinko [Wed, 3 Aug 2011 16:41:47 +0000 (16:41 +0000)]
Explicitly configure what icon is used with Tomcat in the list of uninstallable programs on Windows.

Before this it somehow used the icon from Tomcat<N>.exe (feather(, but when the service name contains "-" Windows somehow was not able to find the icon and displayed a default one. With this change the Tomcat (cat) icon will be used.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153573 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdd info on ciphers
markt [Wed, 3 Aug 2011 10:36:33 +0000 (10:36 +0000)]
Add info on ciphers

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153423 13f79535-47bb-0310-9956-ffa450edef68

14 years agoUpdate to daemon 1.0.7
markt [Wed, 3 Aug 2011 07:53:29 +0000 (07:53 +0000)]
Update to daemon 1.0.7

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153379 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCommitting connection if autoCommit is false.
kfujino [Tue, 2 Aug 2011 11:51:20 +0000 (11:51 +0000)]
Committing connection if autoCommit is false.
Make sure committed connection is returned to the pool if datasource is enabled.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153099 13f79535-47bb-0310-9956-ffa450edef68

14 years agoPrevent direct invocation of the Windows uninstaller without a service name from...
markt [Tue, 2 Aug 2011 09:22:24 +0000 (09:22 +0000)]
Prevent direct invocation of the Windows uninstaller without a service name from executing since the uninstall will not be complete.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153075 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove path attribute from examples of <Context> where this attribute is not needed.
kkolinko [Tue, 2 Aug 2011 09:13:39 +0000 (09:13 +0000)]
Remove path attribute from examples of <Context> where this attribute is not needed.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153074 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCorrect relative links. It is followup to r1151537.
kkolinko [Tue, 2 Aug 2011 03:54:38 +0000 (03:54 +0000)]
Correct relative links. It is followup to r1151537.
CTR: Docs

These pages are already inside "docs", so there should be no "docs/" in relative links.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1153016 13f79535-47bb-0310-9956-ffa450edef68

14 years agoQuote the service name parameter in the registry as well as in the shortcut
markt [Tue, 2 Aug 2011 00:54:27 +0000 (00:54 +0000)]
Quote the service name parameter in the registry as well as in the shortcut

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152988 13f79535-47bb-0310-9956-ffa450edef68

14 years agoCorrectly handle uninstall with the Windows installer of the service is installed...
markt [Mon, 1 Aug 2011 17:03:56 +0000 (17:03 +0000)]
Correctly handle uninstall with the Windows installer of the service is installed with a name that contains a '-' character.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152863 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unused files
markt [Mon, 1 Aug 2011 14:41:28 +0000 (14:41 +0000)]
Remove unused files

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152805 13f79535-47bb-0310-9956-ffa450edef68

14 years agoSimplify mapping for jsp servlet in the default web.xml.
kkolinko [Mon, 1 Aug 2011 09:59:44 +0000 (09:59 +0000)]
Simplify mapping for jsp servlet in the default web.xml.
Multiple url-pattern values in the same servlet-mapping are supported since Servlet 2.5.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152722 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove resolveHosts attribute from AccessLogValve configuration in the default server...
kkolinko [Mon, 1 Aug 2011 09:53:04 +0000 (09:53 +0000)]
Remove resolveHosts attribute from AccessLogValve configuration in the default server.xml.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152719 13f79535-47bb-0310-9956-ffa450edef68

14 years agoAdditional comments about resolveHosts attribute of AccessLogValve.
kkolinko [Mon, 1 Aug 2011 09:41:53 +0000 (09:41 +0000)]
Additional comments about resolveHosts attribute of AccessLogValve.
- The resolveHosts attribute could be used to change the meaning of "common" and "combined" patterns (as it still does in JDBCAccessLogValve), so I mentioned in the docs what to do when that is what the admin wants.
- Align Javadoc with Configuration Reference.
- Mention the effect of enableLookups attribute of connector on ExtendedAccessLogValve.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152716 13f79535-47bb-0310-9956-ffa450edef68

14 years agoEnsure that calls to StandardWrapper methods() that may trigger creation of a Servlet...
markt [Sun, 31 Jul 2011 19:34:14 +0000 (19:34 +0000)]
Ensure that calls to StandardWrapper methods() that may trigger creation of a Servlet instance always do so in way that correctly instantiates a Servlet instance.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152621 13f79535-47bb-0310-9956-ffa450edef68

14 years agoRemove unnecessary call. Reduce timeout.
markt [Sun, 31 Jul 2011 18:21:56 +0000 (18:21 +0000)]
Remove unnecessary call. Reduce timeout.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152610 13f79535-47bb-0310-9956-ffa450edef68

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51588
markt [Sun, 31 Jul 2011 17:39:25 +0000 (17:39 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51588
Make it easier to extend the AccessLogValve to add support for custom elements.

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1152601 13f79535-47bb-0310-9956-ffa450edef68