tomcat7.0
14 years agoReady for next release
markt [Thu, 10 Mar 2011 11:11:38 +0000 (11:11 +0000)]
Ready for next release

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

14 years agostatus is always null, so simplify
markt [Thu, 10 Mar 2011 10:34:09 +0000 (10:34 +0000)]
status is always null, so simplify

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

14 years agoCorrect a typo
kkolinko [Thu, 10 Mar 2011 10:07:43 +0000 (10:07 +0000)]
Correct a typo

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

14 years agocorrect message key
kfujino [Thu, 10 Mar 2011 08:31:51 +0000 (08:31 +0000)]
correct message key

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

14 years agoFix Async with APR and TCP_DEFER_ACCEPT
markt [Wed, 9 Mar 2011 22:36:55 +0000 (22:36 +0000)]
Fix Async with APR and TCP_DEFER_ACCEPT

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

14 years agoFix typo
markt [Wed, 9 Mar 2011 19:01:08 +0000 (19:01 +0000)]
Fix typo

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

14 years agoFix exception destroying a stopped connector.
markt [Wed, 9 Mar 2011 18:49:02 +0000 (18:49 +0000)]
Fix exception destroying a stopped connector.

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

14 years agoTry and make test pass more reliably. This works an 8-core Windows box and a 1-core...
markt [Wed, 9 Mar 2011 18:30:07 +0000 (18:30 +0000)]
Try and make test pass more reliably. This works an 8-core Windows box and a 1-core Linux VM

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

14 years agoSpeed up unit tests on Linux
markt [Wed, 9 Mar 2011 17:27:02 +0000 (17:27 +0000)]
Speed up unit tests on Linux

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

14 years agoSession attributes were only partially changed from Hashtable to ConcurrentHashMap.
rjung [Wed, 9 Mar 2011 17:09:50 +0000 (17:09 +0000)]
Session attributes were only partially changed from Hashtable to ConcurrentHashMap.

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

14 years agoFix some unit test failures
markt [Wed, 9 Mar 2011 15:35:18 +0000 (15:35 +0000)]
Fix some unit test failures

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

14 years agoBetter overriding support
markt [Wed, 9 Mar 2011 15:34:51 +0000 (15:34 +0000)]
Better overriding support

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

14 years agoFix TCK test failure under a security Manager
markt [Wed, 9 Mar 2011 15:00:07 +0000 (15:00 +0000)]
Fix TCK test failure under a security Manager

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

14 years agoFix some test failures.
markt [Wed, 9 Mar 2011 14:48:29 +0000 (14:48 +0000)]
Fix some test failures.
Don't use load() since that creates a whole bunch of edge cases that need to be handled.

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

14 years agoAdd forgotten attribute "sessionCookieName" to context config docs.
rjung [Wed, 9 Mar 2011 14:07:53 +0000 (14:07 +0000)]
Add forgotten attribute "sessionCookieName" to context config docs.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50895
markt [Wed, 9 Mar 2011 13:52:07 +0000 (13:52 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50895
Don't initialize classes during compilation

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50893
markt [Wed, 9 Mar 2011 13:05:05 +0000 (13:05 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50893
Additional information for extras package

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

14 years agoCVE-2011-1088
markt [Wed, 9 Mar 2011 12:20:58 +0000 (12:20 +0000)]
CVE-2011-1088
Fix unit test failures

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50854
markt [Wed, 9 Mar 2011 11:38:38 +0000 (11:38 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50854
Add additional permissions required by the Manager application when running under a security Manager and support a shared Manager installation when $CATALINA_HOME != CATALINA_BASE.

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

14 years agoCVE-2011-1088
markt [Wed, 9 Mar 2011 11:16:48 +0000 (11:16 +0000)]
CVE-2011-1088
Complete the fix for this issue. The optimisation not to configure an authenticator of there were no security constraints meant that in that case @ServletSecurity annotations had no effect. The unit tests did not pick this up since they added an authenticator directly.
Add an explicit unit test for this scenario.

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

14 years agoThis was only a partial fix.
markt [Wed, 9 Mar 2011 10:56:40 +0000 (10:56 +0000)]
This was only a partial fix.

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

14 years agoDocs: Move "allowCasualMultipartParsing",
rjung [Wed, 9 Mar 2011 05:38:23 +0000 (05:38 +0000)]
Docs: Move "allowCasualMultipartParsing",
"swallowAbortedUploads" and "swallowOutput"
from StandardContext to Context.

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

14 years agoFix alphabetic order.
rjung [Wed, 9 Mar 2011 05:24:04 +0000 (05:24 +0000)]
Fix alphabetic order.

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

14 years agoConsistent Ordering.
rjung [Wed, 9 Mar 2011 05:21:34 +0000 (05:21 +0000)]
Consistent Ordering.
No functional change.

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

14 years agoRename new method.
rjung [Wed, 9 Mar 2011 05:05:36 +0000 (05:05 +0000)]
Rename new method.

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

14 years agoReduce visibility of field with public getter
rjung [Tue, 8 Mar 2011 22:27:45 +0000 (22:27 +0000)]
Reduce visibility of field with public getter
and setter.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=25060
markt [Tue, 8 Mar 2011 22:15:34 +0000 (22:15 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=25060
When stopping naming resources look for DataSource resources with a zero-arg close() method and call it if one is found
Works with Commons DBCP.

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

14 years agor1079367 was a little too enthusiastic.
markt [Tue, 8 Mar 2011 21:32:58 +0000 (21:32 +0000)]
r1079367 was a little too enthusiastic.
The "if (!initialized)" tests weren't required by the init() call are

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

14 years agoNew context attribute "swallowAbortedUploads" allows
rjung [Tue, 8 Mar 2011 17:18:16 +0000 (17:18 +0000)]
New context attribute "swallowAbortedUploads" allows
to make request data swallowing configurable for requests
that are too large.

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

14 years agoExpose the global naming context for all Server implementations
markt [Tue, 8 Mar 2011 15:58:53 +0000 (15:58 +0000)]
Expose the global naming context for all Server implementations

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

14 years agoAdd release dates
markt [Tue, 8 Mar 2011 15:39:29 +0000 (15:39 +0000)]
Add release dates

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

14 years agoAdd the CVE info for 7.0.10
markt [Tue, 8 Mar 2011 15:37:36 +0000 (15:37 +0000)]
Add the CVE info for 7.0.10

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

14 years agoAlign SSL init for BIO and NIO.
markt [Tue, 8 Mar 2011 15:19:19 +0000 (15:19 +0000)]
Align SSL init for BIO and NIO.
Fixes https://issues.apache.org/bugzilla/show_bug.cgi?id=48208 for NIO.
Adds support for keyPass, truststoreProvider & keystoreProvider

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

14 years agoRemove some unused code
markt [Tue, 8 Mar 2011 14:21:41 +0000 (14:21 +0000)]
Remove some unused code

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

14 years agoAdd the hooks (no implementation yet) for BIO and NIO to share the code that is curre...
markt [Tue, 8 Mar 2011 14:03:20 +0000 (14:03 +0000)]
Add the hooks (no implementation yet) for BIO and NIO to share the code that is currently in JSSESocketFactory

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

14 years agoFix build failure and don't tie NIO connector to a single SSL implementation
markt [Tue, 8 Mar 2011 14:02:03 +0000 (14:02 +0000)]
Fix build failure and don't tie NIO connector to a single SSL implementation

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

14 years agoBetter Javadoc
markt [Tue, 8 Mar 2011 13:50:46 +0000 (13:50 +0000)]
Better Javadoc

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

14 years agoRemove JSSEFactory. Now we no longer need to support older JSSE versions, this layer...
markt [Tue, 8 Mar 2011 13:50:07 +0000 (13:50 +0000)]
Remove JSSEFactory. Now we no longer need to support older JSSE versions, this layer of abstraction is not required.

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

14 years agoDon't swallow exceptions when they are not expected
markt [Tue, 8 Mar 2011 12:10:44 +0000 (12:10 +0000)]
Don't swallow exceptions when they are not expected

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

14 years agoAdd missing message
markt [Tue, 8 Mar 2011 11:28:15 +0000 (11:28 +0000)]
Add missing message

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

14 years agoRefactor to address https://issues.apache.org/bugzilla/show_bug.cgi?id=48208#c13
markt [Tue, 8 Mar 2011 11:15:37 +0000 (11:15 +0000)]
Refactor to address https://issues.apache.org/bugzilla/show_bug.cgi?id=48208#c13
Don't configure a TrustManagerFactory instance if it isn't going to be used.

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

14 years agoRestore the ability to register the Tomcat jndi URL handler via the java.protocol...
markt [Tue, 8 Mar 2011 11:04:38 +0000 (11:04 +0000)]
Restore the ability to register the Tomcat jndi URL handler via the java.protocol.handler.pkgs system property.

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

14 years agoRemove unused code
markt [Mon, 7 Mar 2011 22:18:02 +0000 (22:18 +0000)]
Remove unused code

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

14 years agoFix some warnings
markt [Mon, 7 Mar 2011 17:42:52 +0000 (17:42 +0000)]
Fix some warnings

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

14 years agoFix Eclipse and FindBugs warnings
markt [Mon, 7 Mar 2011 16:46:45 +0000 (16:46 +0000)]
Fix Eclipse and FindBugs warnings
Removed unused code

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

14 years agoCode cleanup
markt [Mon, 7 Mar 2011 14:55:22 +0000 (14:55 +0000)]
Code cleanup
- remove unused code
- fix FindBugs warnings
- fix Eclipse warnings

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

14 years agoFix Eclipse warnings
markt [Mon, 7 Mar 2011 14:24:08 +0000 (14:24 +0000)]
Fix Eclipse warnings

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

14 years agoAnother FindBugs false positive
markt [Mon, 7 Mar 2011 11:56:19 +0000 (11:56 +0000)]
Another FindBugs false positive

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=26701
markt [Sun, 6 Mar 2011 22:12:10 +0000 (22:12 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=26701
Provide a mechanism for users to register their own URLStreamHandlerFactory objects.

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

14 years agoClean-up, mainly unused code
markt [Sun, 6 Mar 2011 22:02:28 +0000 (22:02 +0000)]
Clean-up, mainly unused code

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

14 years agoRemove unused code
markt [Sun, 6 Mar 2011 17:37:30 +0000 (17:37 +0000)]
Remove unused code

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

14 years agoMake more efficient / fix FindBugs nag
markt [Sun, 6 Mar 2011 17:35:12 +0000 (17:35 +0000)]
Make more efficient / fix FindBugs nag

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=48208
markt [Sun, 6 Mar 2011 09:33:26 +0000 (09:33 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48208
Add custom trust manager support

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

14 years agoRefactoring for re-use
markt [Sun, 6 Mar 2011 07:58:26 +0000 (07:58 +0000)]
Refactoring for re-use

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

14 years agoUpdate comments/test case name
markt [Sun, 6 Mar 2011 07:47:17 +0000 (07:47 +0000)]
Update comments/test case name

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50855
markt [Sun, 6 Mar 2011 07:33:58 +0000 (07:33 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50855
Fix NPE on HttpServletRequest.logout() when debug logging is enabled.

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

14 years agoFix threading issue reported on dev list
markt [Sun, 6 Mar 2011 07:17:07 +0000 (07:17 +0000)]
Fix threading issue reported on dev list

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

14 years agoPrep for next release
markt [Sun, 6 Mar 2011 06:27:30 +0000 (06:27 +0000)]
Prep for next release

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

14 years agoAdd missing entry.
markt [Sun, 6 Mar 2011 06:26:46 +0000 (06:26 +0000)]
Add missing entry.

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

14 years agoCode clean-up
markt [Fri, 4 Mar 2011 16:49:14 +0000 (16:49 +0000)]
Code clean-up
 - fix FindBugs warnings
 - remove unused code

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

14 years agoNow there is always an authenticator, need to allow for the extra MBean
markt [Fri, 4 Mar 2011 15:54:28 +0000 (15:54 +0000)]
Now there is always an authenticator, need to allow for the extra MBean

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

14 years agoCode clean-up
markt [Fri, 4 Mar 2011 15:52:01 +0000 (15:52 +0000)]
Code clean-up
 - fix FindBugs warnings
 - remove unused code

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

14 years agoAvoid npe
markt [Fri, 4 Mar 2011 15:31:04 +0000 (15:31 +0000)]
Avoid npe

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

14 years ago@ServletSecurity
markt [Fri, 4 Mar 2011 15:17:22 +0000 (15:17 +0000)]
@ServletSecurity
Servlets added via addServlet() should not be processed unless created via craeteServlet. Need to delay scanning until urlPatterns are known

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

14 years agoCheck metadata-complete=true leads to @ServletSecurity being ignored
markt [Fri, 4 Mar 2011 11:23:43 +0000 (11:23 +0000)]
Check metadata-complete=true leads to @ServletSecurity being ignored

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

14 years agoCheck web.xml takes precedence over @ServletSecurity
markt [Fri, 4 Mar 2011 11:17:06 +0000 (11:17 +0000)]
Check web.xml takes precedence over @ServletSecurity

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

14 years agoAdd missing files and license header
fhanik [Thu, 3 Mar 2011 19:20:38 +0000 (19:20 +0000)]
Add missing files and license header
Add NOTICE/LICENSE to all JAR files

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

14 years agoTest that individual roles are correctly handled
markt [Thu, 3 Mar 2011 19:13:52 +0000 (19:13 +0000)]
Test that individual roles are correctly handled

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

14 years ago@ServletSecurity
markt [Thu, 3 Mar 2011 12:56:07 +0000 (12:56 +0000)]
@ServletSecurity
Refactor to reduce duplication in test code
Add tests for method constraints

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

14 years ago@ServletSecurity support
markt [Thu, 3 Mar 2011 11:31:56 +0000 (11:31 +0000)]
@ServletSecurity support
Add tests for subclasses

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

14 years agoFix typo
markt [Thu, 3 Mar 2011 11:24:35 +0000 (11:24 +0000)]
Fix typo

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

14 years ago[SECURITY]
markt [Thu, 3 Mar 2011 11:16:51 +0000 (11:16 +0000)]
[SECURITY]
Start of fix for issue reported on users list that @ServletSecurity annotations were ignored.
This fix is not yet complete. This first part:
- Triggers the loading of the Wrapper before the constraints are processed to ensure that any @ServletSecurity annotations are taken account of
- Makes sure the constraints collection is thread-safe given new usage
- Adds scanning for @ServletSecurity when a Servlet is loaded
- Ensure there is always an authenticator when using the embedded Tomcat class so that @ServletSecurity will have an effect
- Adds a simple unit test to check @ServletSecurity annotations are processed
Further commits will add additional test cases and any changes required for those test cases to pass

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

14 years agoDoco update
fhanik [Wed, 2 Mar 2011 21:18:18 +0000 (21:18 +0000)]
Doco update

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

14 years agohttps://issues.apache.org/bugzilla/show_bug.cgi?id=50857
fhanik [Wed, 2 Mar 2011 21:15:07 +0000 (21:15 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=50857
Timeouts have to be trapped, and properly handled

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

14 years agoSpeed up shut down when ThreadLocalLeakPreventionListener is enabled
markt [Wed, 2 Mar 2011 15:19:58 +0000 (15:19 +0000)]
Speed up shut down when ThreadLocalLeakPreventionListener is enabled

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

14 years agoRemove unused code
markt [Wed, 2 Mar 2011 13:55:19 +0000 (13:55 +0000)]
Remove unused code

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

14 years agoFix Javadoc
markt [Wed, 2 Mar 2011 13:48:16 +0000 (13:48 +0000)]
Fix Javadoc

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=27988
markt [Wed, 2 Mar 2011 13:23:37 +0000 (13:23 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=27988
Improve reporting of missing files

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

14 years agoUpdate change log
markt [Wed, 2 Mar 2011 13:17:37 +0000 (13:17 +0000)]
Update change log

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

14 years agoBetter test for APR
markt [Wed, 2 Mar 2011 12:42:34 +0000 (12:42 +0000)]
Better test for APR

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

14 years agoCorrect issues in the SSL renegotiation tests
markt [Wed, 2 Mar 2011 12:03:05 +0000 (12:03 +0000)]
Correct issues in the SSL renegotiation tests

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

14 years agoSave a few cycles
markt [Wed, 2 Mar 2011 11:43:06 +0000 (11:43 +0000)]
Save a few cycles

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

14 years agoImprove the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48863
kkolinko [Tue, 1 Mar 2011 23:59:36 +0000 (23:59 +0000)]
Improve the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=48863
1) Be more strict when ignoring the warning:
ignore only when it is the "lib" directory and when it does not exist
2) Warn about JARs created from expanding the GLOB pattern as well
3) s/new File(f.getCanonicalPath())/f.getCanonicalFile()/ for efficiency

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

14 years agoCorrect several typos
kkolinko [Tue, 1 Mar 2011 23:24:33 +0000 (23:24 +0000)]
Correct several typos

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

14 years agoMake sure we also validate the content that is sent and received
fhanik [Tue, 1 Mar 2011 20:34:00 +0000 (20:34 +0000)]
Make sure we also validate the content that is sent and received

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

14 years agoImplement renegotiation for SSL cert authentication
fhanik [Tue, 1 Mar 2011 20:04:26 +0000 (20:04 +0000)]
Implement renegotiation for SSL cert authentication

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

14 years agoCorrectly determine if a buffer has data or not
fhanik [Tue, 1 Mar 2011 19:58:55 +0000 (19:58 +0000)]
Correctly determine if a buffer has data or not

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

14 years agopropagate all exceptions through IOExceptions
fhanik [Tue, 1 Mar 2011 18:24:03 +0000 (18:24 +0000)]
propagate all exceptions through IOExceptions

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

14 years agoSimple implementation of a forced and blocking renegotiation with a SSL client
fhanik [Tue, 1 Mar 2011 18:13:38 +0000 (18:13 +0000)]
Simple implementation of a forced and blocking renegotiation with a SSL client

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

14 years agoMove outside of loop as per kkolinko's review
markt [Tue, 1 Mar 2011 14:13:16 +0000 (14:13 +0000)]
Move outside of loop as per kkolinko's review

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

14 years agoMissed a keystore in the refactoring
markt [Tue, 1 Mar 2011 13:35:24 +0000 (13:35 +0000)]
Missed a keystore in the refactoring

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

14 years agoFix bug in unit test due to some Lifecycle refactoring
markt [Tue, 1 Mar 2011 13:24:31 +0000 (13:24 +0000)]
Fix bug in unit test due to some Lifecycle refactoring

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

14 years agoImprove handling of SSL renegotiation by failing earlier when the request body contai...
markt [Tue, 1 Mar 2011 12:32:25 +0000 (12:32 +0000)]
Improve handling of SSL renegotiation by failing earlier when the request body contains more bytes than maxSavePostSize.

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

14 years agoRemove the init from references to handshake since the same fields/methods will be...
markt [Tue, 1 Mar 2011 11:12:22 +0000 (11:12 +0000)]
Remove the init from references to handshake since the same fields/methods will be used for renegotiation

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

14 years agoExtract the client-cert tests into a separate test
markt [Tue, 1 Mar 2011 10:16:36 +0000 (10:16 +0000)]
Extract the client-cert tests into a separate test
Check maxPostSize works as expected with client-cert

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

14 years agoClear remainder of current FindBugs issues in unit tests
markt [Tue, 1 Mar 2011 09:33:57 +0000 (09:33 +0000)]
Clear remainder of current FindBugs issues in unit tests

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

14 years agoMore entries
markt [Tue, 1 Mar 2011 09:13:18 +0000 (09:13 +0000)]
More entries

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

14 years agoRemove unused code
markt [Tue, 1 Mar 2011 09:12:51 +0000 (09:12 +0000)]
Remove unused code

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

14 years agoFix Findbugs nag
markt [Tue, 1 Mar 2011 09:02:52 +0000 (09:02 +0000)]
Fix Findbugs nag
Reduce visibility

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

14 years agoGrr. This worked if 20 bytes were read in one go
markt [Tue, 1 Mar 2011 09:01:30 +0000 (09:01 +0000)]
Grr. This worked if 20 bytes were read in one go

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