tomcat7.0
15 years agoMake sure copyright year is replaced for root webapp
markt [Tue, 5 Oct 2010 07:55:04 +0000 (07:55 +0000)]
Make sure copyright year is replaced for root webapp

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

15 years agotypo
markt [Tue, 5 Oct 2010 07:45:04 +0000 (07:45 +0000)]
typo

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

15 years agoCorrect fix fot 49669
markt [Tue, 5 Oct 2010 07:30:54 +0000 (07:30 +0000)]
Correct fix fot 49669

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

15 years agoUpdating changelog with fix for https://issues.apache.org/bugzilla/show_bug.cgi?id...
timw [Tue, 5 Oct 2010 02:57:25 +0000 (02:57 +0000)]
Updating changelog with fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50026

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

15 years agoAdd missing AL2 header
markt [Mon, 4 Oct 2010 22:00:38 +0000 (22:00 +0000)]
Add missing AL2 header

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49945
markt [Mon, 4 Oct 2010 21:24:55 +0000 (21:24 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49945
More JMX improvements.
Patch provided by Chamith Buddhika.

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

15 years agoMore fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
timw [Mon, 4 Oct 2010 20:37:11 +0000 (20:37 +0000)]
More fixes for https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
Calculating path prefix used in listings correctly so links in listings produced by WebdavServlet mounted to a subpath are correct.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50026 for WebdavServlet
timw [Mon, 4 Oct 2010 20:33:57 +0000 (20:33 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50026 for WebdavServlet
Factored checking of special WEB-INF and META-INF paths into service to trap requests for GET methods handled by DefaultServlet (which does not check access).
Retained checking of special paths in handlers for copy, delete, move (copy + delete), and in enumeration of resources (propfind).

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
timw [Mon, 4 Oct 2010 20:19:09 +0000 (20:19 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50026
Always calculate path of resource to be served relative to the context root.
This invokes the standard protection of WEB-INF and META-INF directories.
This is a breaking change for the unofficial use of DefaultServlet to remount the webapp base under a new path.

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

15 years agoReduce code duplication. Convert file names to a context path in a single method.
markt [Mon, 4 Oct 2010 14:50:41 +0000 (14:50 +0000)]
Reduce code duplication. Convert file names to a context path in a single method.

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

15 years agoRemove duplicate method. Rename remaining method.
markt [Mon, 4 Oct 2010 14:18:14 +0000 (14:18 +0000)]
Remove duplicate method. Rename remaining method.

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

15 years agoRemove todo for bad idea
markt [Mon, 4 Oct 2010 13:47:25 +0000 (13:47 +0000)]
Remove todo for bad idea

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

15 years agoUse absolute time spend to unlockAccept and lower down the timeout to 30 secs
mturk [Mon, 4 Oct 2010 09:37:11 +0000 (09:37 +0000)]
Use absolute time spend to unlockAccept and lower down the timeout to 30 secs

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

15 years agoMladen fixed 49923
markt [Mon, 4 Oct 2010 09:30:13 +0000 (09:30 +0000)]
Mladen fixed 49923

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

15 years agoFix 49923 by making sure timeouts can't be negative
mturk [Mon, 4 Oct 2010 09:22:03 +0000 (09:22 +0000)]
Fix 49923 by making sure timeouts can't be negative

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

15 years agoUse better explanation
mturk [Mon, 4 Oct 2010 08:55:12 +0000 (08:55 +0000)]
Use better explanation

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

15 years agoAdd log.warn if unlockAccept fails to wakeup the listening socket
mturk [Mon, 4 Oct 2010 08:52:11 +0000 (08:52 +0000)]
Add log.warn if unlockAccept fails to wakeup the listening socket

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

15 years agoTo avoid NoSuchMethodException,
kfujino [Mon, 4 Oct 2010 06:47:17 +0000 (06:47 +0000)]
To avoid NoSuchMethodException,
xmlValidation and xmlNamespaceAware are removed from the createStandardHost definition of mbeans-descriptors.xml.
xmlValidation and xmlNamespaceAware are attributes of not Host but Contex.

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

15 years agoSimplify instantiating parent loggers. No need to instantiate all of them all at...
markt [Sun, 3 Oct 2010 22:11:04 +0000 (22:11 +0000)]
Simplify instantiating parent loggers. No need to instantiate all of them all at once since Logger.getLogger() will result in a call to this method.

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

15 years agoTweak generics. fix a handful of warnings.
markt [Sun, 3 Oct 2010 21:58:42 +0000 (21:58 +0000)]
Tweak generics. fix a handful of warnings.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49937
markt [Sun, 3 Oct 2010 20:53:49 +0000 (20:53 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49937
Use InstanceManager to create AsyncListeners so annotations are processed. Based on a patch by David Jencks.

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

15 years agoADd missing entry
markt [Sun, 3 Oct 2010 19:23:27 +0000 (19:23 +0000)]
ADd missing entry

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

15 years agoCorrect fix version. I think a few more of these need correcting. Checking now...
markt [Sun, 3 Oct 2010 19:18:20 +0000 (19:18 +0000)]
Correct fix version. I think a few more of these need correcting. Checking now...

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

15 years agoImprove handling of setting primitive values on beans.
markt [Sun, 3 Oct 2010 19:16:32 +0000 (19:16 +0000)]
Improve handling of setting primitive values on beans.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49922
markt [Sun, 3 Oct 2010 17:27:42 +0000 (17:27 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49922
Don't map filter twice if filter matches multiple mapping.

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

15 years agoCorrect changelog entry for r1003923
kkolinko [Sun, 3 Oct 2010 17:03:05 +0000 (17:03 +0000)]
Correct changelog entry for r1003923
7.0.3 was cut from r1003911, so this one will be in 7.0.4 as Mark noted in BZ
Correct a typo in the bug number. It is BZ 49998

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49998
timw [Sun, 3 Oct 2010 06:53:15 +0000 (06:53 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49998
Handle single quoted attributes in detection of jsp:root element in XML syntax JSP files.

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

15 years agoBump version
markt [Sat, 2 Oct 2010 22:15:50 +0000 (22:15 +0000)]
Bump version

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

15 years agoFix NPE and TCK failures caused by previous fix for bug 49799.
markt [Sat, 2 Oct 2010 21:14:37 +0000 (21:14 +0000)]
Fix NPE and TCK failures caused by previous fix for bug 49799.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49985
markt [Sat, 2 Oct 2010 18:53:30 +0000 (18:53 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49985
Make thread safe

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

15 years agoRevert r1003552 & r1003550 as it had a significant negative performance impact (order...
markt [Sat, 2 Oct 2010 17:57:42 +0000 (17:57 +0000)]
Revert r1003552 & r1003550 as it had a significant negative performance impact (orders of magnitude) on Windows during testing.

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

15 years agoCreate service-install.log file during installation with params that were used to...
mturk [Sat, 2 Oct 2010 17:32:14 +0000 (17:32 +0000)]
Create service-install.log file during installation with params that were used to invoke commons daemon

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49916
markt [Fri, 1 Oct 2010 17:29:03 +0000 (17:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49916
Switch to using an initialisation parameter to pass JSP file information from Catalina to Jasper. This simplifies the Catalina code as well as making it easier for Geronimo and others to integrate Jasper.
Patch provided by David Jencks.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49915
markt [Fri, 1 Oct 2010 16:49:29 +0000 (16:49 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49915
Make error more obvious, particularly when accessed via JConsole, if StandardServer.storeConfig() is called when there is no StoreConfig implementation present.

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

15 years agoUpdate changelog
markt [Fri, 1 Oct 2010 16:34:37 +0000 (16:34 +0000)]
Update changelog

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49905
markt [Fri, 1 Oct 2010 16:32:31 +0000 (16:32 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49905
Prevent memory leak when using aysnc session replication

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

15 years ago-e doesn't exist on Solaris
markt [Fri, 1 Oct 2010 15:08:23 +0000 (15:08 +0000)]
-e doesn't exist on Solaris

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

15 years agoAdd a TODO
markt [Fri, 1 Oct 2010 14:58:43 +0000 (14:58 +0000)]
Add a TODO

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

15 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=49890
markt [Fri, 1 Oct 2010 14:54:53 +0000 (14:54 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=49890
Detect when the JVM bug occurs and log an error asking for more information.

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

15 years agogetKeyCount() didn't do anything due to local variable definition
markt [Fri, 1 Oct 2010 14:36:31 +0000 (14:36 +0000)]
getKeyCount() didn't do anything due to local variable definition

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49861
markt [Fri, 1 Oct 2010 11:37:05 +0000 (11:37 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49861
Don't use commas when logging RMI port values

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

15 years agoFix Eclipse warnings
markt [Fri, 1 Oct 2010 11:15:56 +0000 (11:15 +0000)]
Fix Eclipse warnings

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49667
markt [Fri, 1 Oct 2010 11:10:51 +0000 (11:10 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49667
Ensure JDBC leak prevention code doesn't trigger the very memory leak it is meant to be fixing.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
markt [Fri, 1 Oct 2010 10:21:58 +0000 (10:21 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49860
Add support for trailing headers

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49856
markt [Thu, 30 Sep 2010 21:47:46 +0000 (21:47 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49856
Add an executorName attribute to Connectors so it is possible to trace ThreadPool to Connector to Executor via JMX.

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

15 years agoFix Eclipse warnings
markt [Thu, 30 Sep 2010 21:40:11 +0000 (21:40 +0000)]
Fix Eclipse warnings

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

15 years agoRegister and deregister Executors in JMX
markt [Thu, 30 Sep 2010 21:39:16 +0000 (21:39 +0000)]
Register and deregister Executors in JMX

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

15 years agoFix warnings in this package
markt [Thu, 30 Sep 2010 18:00:23 +0000 (18:00 +0000)]
Fix warnings in this package

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49730
markt [Thu, 30 Sep 2010 17:56:42 +0000 (17:56 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49730
Race condition in executor can lead to long delays in request processing

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

15 years agoFix the root cause of the previous TCK failures (badly re-factored flush()) and resto...
markt [Thu, 30 Sep 2010 17:35:35 +0000 (17:35 +0000)]
Fix the root cause of the previous TCK failures (badly re-factored flush()) and restore the changes that were just working around the symptoms (poller stuff).
Servlet 3.0 passes for the AJP/APR connector as of this commit.

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

15 years agoFix remaining issues with AJP/APR and TCK. Note mod_jk log is full of warnings so...
markt [Thu, 30 Sep 2010 16:16:05 +0000 (16:16 +0000)]
Fix remaining issues with AJP/APR and TCK. Note mod_jk log is full of warnings so there is still work to do here.

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

15 years agoFix some of the remaining issues with the AJP/APR connector post async refactoring...
markt [Thu, 30 Sep 2010 13:44:11 +0000 (13:44 +0000)]
Fix some of the remaining issues with the AJP/APR connector post async refactoring. Still does not pass the TCK.

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

15 years agoAvoid NPE when mapOwner is null.
kfujino [Thu, 30 Sep 2010 02:49:34 +0000 (02:49 +0000)]
Avoid NPE when mapOwner is null.

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

15 years agoClean-up. No functional change.
markt [Thu, 30 Sep 2010 00:31:33 +0000 (00:31 +0000)]
Clean-up. No functional change.

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

15 years agoGet AJP working after async refactoring. Some issues remain with AJP/APR connector...
markt [Thu, 30 Sep 2010 00:28:59 +0000 (00:28 +0000)]
Get AJP working after async refactoring. Some issues remain with AJP/APR connector which still has a handful of TCK failures.

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

15 years agoMinor clean-up to align with AJP
markt [Thu, 30 Sep 2010 00:27:45 +0000 (00:27 +0000)]
Minor clean-up to align with AJP

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

15 years agoTweak the refactoring
markt [Wed, 29 Sep 2010 16:18:21 +0000 (16:18 +0000)]
Tweak the refactoring

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

15 years agoRe-factor the async state machine into a separate class so it can be re-used for...
markt [Wed, 29 Sep 2010 16:13:05 +0000 (16:13 +0000)]
Re-factor the async state machine into a separate class so it can be re-used for the AJP processors as well.

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

15 years agoRename local variable to make code clearer
markt [Wed, 29 Sep 2010 16:02:24 +0000 (16:02 +0000)]
Rename local variable to make code clearer

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

15 years agoRefactor logging
markt [Wed, 29 Sep 2010 15:36:54 +0000 (15:36 +0000)]
Refactor logging

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

15 years agoReduce code duplication in the APR connectors (prior to aligning with the Async refac...
markt [Wed, 29 Sep 2010 15:21:53 +0000 (15:21 +0000)]
Reduce code duplication in the APR connectors (prior to aligning with the Async refactoring)

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50021
markt [Wed, 29 Sep 2010 10:15:51 +0000 (10:15 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50021
Don't reference ExceptionUtisl from Bootstrap - it won't be visible at startup.

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

15 years agoFix error in fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Wed, 29 Sep 2010 10:07:10 +0000 (10:07 +0000)]
Fix error in fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Should use ExcpetionUtils from o.a.tomcat.util, not o.a.jasper.util
Fixed with the help of Eclipe's organise imports that also removed a few unused imports.

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

15 years agoCorrect a typo in message
kkolinko [Wed, 29 Sep 2010 08:18:52 +0000 (08:18 +0000)]
Correct a typo in message

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

15 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=50018
timw [Wed, 29 Sep 2010 08:08:32 +0000 (08:08 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=50018
Minor javadoc corrections in Jasper.

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

15 years agoBe consistent with CATALINA_PID quoting and always redirect all streams to /dev/null...
mturk [Wed, 29 Sep 2010 05:43:57 +0000 (05:43 +0000)]
Be consistent with CATALINA_PID quoting and always redirect all streams to /dev/null cause we are interested only in return value

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

15 years agoMore review comments form mturk. Tighten up handling of ps output.
markt [Tue, 28 Sep 2010 21:30:27 +0000 (21:30 +0000)]
More review comments form mturk. Tighten up handling of ps output.

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

15 years agoRespond to mturk's review. Make rm more robust. Avoid potential issues with (...).
markt [Tue, 28 Sep 2010 21:20:06 +0000 (21:20 +0000)]
Respond to mturk's review. Make rm  more robust. Avoid potential issues with (...).

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49195
markt [Tue, 28 Sep 2010 20:43:32 +0000 (20:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49195
Avoid error message when shutting down Windows service when the shutdown port is disabled.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49665
markt [Tue, 28 Sep 2010 17:23:05 +0000 (17:23 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49665
Better handling for missing TLD files. Report JSP filename and location.

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

15 years agoUpdate
markt [Tue, 28 Sep 2010 17:02:33 +0000 (17:02 +0000)]
Update

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49728
markt [Tue, 28 Sep 2010 16:59:54 +0000 (16:59 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49728
Improve PID file handling, particularly when another process creates it and Tomcat is unable to write to the file.

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49657
markt [Tue, 28 Sep 2010 14:43:03 +0000 (14:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49657
Correctly handle CGI executables with spaces in the name/path

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49625
markt [Tue, 28 Sep 2010 12:08:53 +0000 (12:08 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49625
Ensure Vary header is set if response may be compressed rather than only setting it if it is compressed.

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

15 years agoAdd license header
kkolinko [Tue, 28 Sep 2010 11:37:14 +0000 (11:37 +0000)]
Add license header

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

15 years agoMoved all Eclipse specific files into res/ide-support/eclipse.
timw [Tue, 28 Sep 2010 09:36:08 +0000 (09:36 +0000)]
Moved all Eclipse specific files into res/ide-support/eclipse.
Removed spaces from launch target filenames.
Corrected launch targets to run in output/build instead of root directory (still not sure if they're a good idea)
Added an Ant ide-eclipse target to prepare the working copy to be built with Eclipse and create Eclipse project files.
Updated the Building docs to document new Eclipse setup method.
Added descriptions of how to configure Eclipse to respect Tomcat coding conventions to the Building guide.

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

15 years agoAdding myself to active devs list.
timw [Tue, 28 Sep 2010 09:28:30 +0000 (09:28 +0000)]
Adding myself to active devs list.

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

15 years agoUpdate
markt [Mon, 27 Sep 2010 23:09:54 +0000 (23:09 +0000)]
Update

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

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49209
markt [Mon, 27 Sep 2010 23:06:08 +0000 (23:06 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49209
Prevent possible AccessControlException during undeployment when running with a security manager
Patch provided by Sylvain Laurent

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

15 years agoUpdate
markt [Mon, 27 Sep 2010 22:31:03 +0000 (22:31 +0000)]
Update

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

15 years agoRemaining fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 22:29:30 +0000 (22:29 +0000)]
Remaining fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 22:22:02 +0000 (22:22 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 22:17:30 +0000 (22:17 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 22:16:26 +0000 (22:16 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 22:12:05 +0000 (22:12 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 22:01:45 +0000 (22:01 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 21:32:25 +0000 (21:32 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 20:52:49 +0000 (20:52 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Some Throwables must always be re-thrown

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

15 years agoPartial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
markt [Mon, 27 Sep 2010 20:24:18 +0000 (20:24 +0000)]
Partial fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48644
Don't catch Throwable

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

15 years agoFix comment typo
markt [Mon, 27 Sep 2010 12:58:06 +0000 (12:58 +0000)]
Fix comment typo

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

15 years agogit-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1001718 13f79535-47bb-0310...
markt [Mon, 27 Sep 2010 12:56:38 +0000 (12:56 +0000)]
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1001718 13f79535-47bb-0310-9956-ffa450edef68

15 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49884
markt [Mon, 27 Sep 2010 12:13:32 +0000 (12:13 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49884

This required a major re-factoring of the async implementation. In summary:
- Moved state management to the Coyote Processor
- Added a SocketWrapper to the APR socket
- Added syncs to ensure only one async state change at a time
- Added syncs to ensure only one thread changing a socket's state at a time

A number of new bugs were also uncovered and fixed by this re-factoring:
- delay processing complete() and dispatch() until request where startAsync() is called finished processing
- onAsyncStart listener event

Currently the test case for bug 49884 passes with the security manager enabled using "ab -n 5000 -c 150 -k ..." (it broke with "ab -n 50 -c 10 ..." previously)

The unit tests pass for all three HTTP connectors.

The AJP connectors have only been modified to ensure the code compiles.

The following work remains:
- Testing all connectors (HTTP and AJP) with TCK + security manager and fixing whatever is broken
- Further clean-up
- There is further scope for reducing code duplication between the connectors / aligning the code so it is easier to maintain.

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

15 years agoChange method name so it is easier to distinguish between async and comet processing...
markt [Mon, 27 Sep 2010 00:17:26 +0000 (00:17 +0000)]
Change method name so it is easier to distinguish between async and comet processing. No so important here since comet isn't supported, but need to change it to align with changes to be made in NIO and APR

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

15 years agoRemove some unused code.
markt [Sun, 26 Sep 2010 22:58:38 +0000 (22:58 +0000)]
Remove some unused code.

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

15 years agoMore NPE avoidance.
markt [Sun, 26 Sep 2010 22:50:30 +0000 (22:50 +0000)]
More NPE avoidance.
Keep process methods aligned.

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

15 years agoFix a handful of Eclipse warnings
markt [Sun, 26 Sep 2010 22:46:35 +0000 (22:46 +0000)]
Fix a handful of Eclipse warnings

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

15 years agoSince SocketStatus is always OPEN or TIMEOUT for BIO, remove the test.
markt [Sun, 26 Sep 2010 22:38:14 +0000 (22:38 +0000)]
Since SocketStatus is always OPEN or TIMEOUT for BIO, remove the test.

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

15 years agoAdd some Javadoc.
markt [Sun, 26 Sep 2010 22:37:31 +0000 (22:37 +0000)]
Add some Javadoc.
Use SocketStatus.OPEN rather than STOP since the BIO connector treats them the same way and it reduces code complexity. It also simplifies async re-factoring I have in the works,

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

15 years agoBetter Javadoc.
markt [Sun, 26 Sep 2010 22:22:25 +0000 (22:22 +0000)]
Better Javadoc.
If endpoint is shutting down, return false so connection to client is closed immediately.

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

15 years agoClean-up. Reduce whitespace, unnecessary comments
markt [Sun, 26 Sep 2010 21:26:08 +0000 (21:26 +0000)]
Clean-up. Reduce whitespace, unnecessary comments

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