fhanik [Fri, 20 Nov 2009 21:39:36 +0000 (21:39 +0000)]
Add in DataSource supprot
Add in XA support
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882723
13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 20 Nov 2009 19:27:11 +0000 (19:27 +0000)]
Complete the FileUpload implementation and use it for the html manager app.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882690
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 20 Nov 2009 16:57:31 +0000 (16:57 +0000)]
https://issues.apache.org/bugzilla/show_bug.cgi?id=48252
Fix potential recursion
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882640
13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 20 Nov 2009 13:46:21 +0000 (13:46 +0000)]
Start to hook-up the commons-file upload port to the Servlet3 file upload API
- Make sure the upload config is available when required
- Start to migrate the HTML manager to the upload API
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882550
13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 20 Nov 2009 13:42:34 +0000 (13:42 +0000)]
Fix error in previous commit
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882547
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 22:06:43 +0000 (22:06 +0000)]
Improve workaround for CVE-2009-3555
On the plus side, it doesn't rely on an async event to close the connection
On the down side, I haven't yet found a way to log client initiated handshakes before they get closed
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882320
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 18:00:09 +0000 (18:00 +0000)]
Fix SSL for BIO post refactoring
Make attribute names consistent
Endpoints are now responsible for configuring the SSL "engine"
Basics work but still needs more testing
NIO & APR to follow
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882231
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 16:05:48 +0000 (16:05 +0000)]
Fix Eclipse warning
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882186
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 15:08:03 +0000 (15:08 +0000)]
Fix SSL config error as a result of attribute refactoring.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882169
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 14:05:56 +0000 (14:05 +0000)]
Fix the Eclipse warnings - no functional change
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882151
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 14:01:27 +0000 (14:01 +0000)]
Remove unused code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882148
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 02:01:57 +0000 (02:01 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48234
Align Javadoc with code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882029
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 00:50:04 +0000 (00:50 +0000)]
Static so sync on class object
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882019
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 00:46:52 +0000 (00:46 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48233
More loggers to private static final
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882017
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 19 Nov 2009 00:20:35 +0000 (00:20 +0000)]
Fix copy/paste error
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882014
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 23:54:24 +0000 (23:54 +0000)]
Fix theorectical sync issue and soem Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882008
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 23:47:29 +0000 (23:47 +0000)]
Fix NPE
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882004
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 23:33:57 +0000 (23:33 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48172
Potential threading issues, make fields final where possible
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@882002
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 23:22:13 +0000 (23:22 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48197
Reduce visibility where possible
Fix javadoc
Based on a patch by sebb
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881996
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 23:10:53 +0000 (23:10 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48230
Remove unused imports. Patch provided by sebb.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881990
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 22:37:19 +0000 (22:37 +0000)]
Fix copy and paste errors
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881972
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 21:23:25 +0000 (21:23 +0000)]
Fix more typos
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881942
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 13:39:45 +0000 (13:39 +0000)]
Fix typos
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881776
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 13:23:51 +0000 (13:23 +0000)]
Being *really* picky. It is a single web app.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881765
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 12:10:12 +0000 (12:10 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48217
Make logs final and private; add missing @Override markers
Patch provided by sebb.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881742
13f79535-47bb-0310-9956-
ffa450edef68
markt [Wed, 18 Nov 2009 11:53:46 +0000 (11:53 +0000)]
Fix typo
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881735
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Wed, 18 Nov 2009 03:09:12 +0000 (03:09 +0000)]
Updated to match the latest catalina.policy file
Updated the section about implicit permissions
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881655
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Wed, 18 Nov 2009 03:00:57 +0000 (03:00 +0000)]
Wrapped long lines. As the text of this file is copy-pasted into security-manager-howto.html, it will make it more readable.
Added a comment regarding tomcat-juli.jar
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881654
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 23:03:43 +0000 (23:03 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48196
Reduce visibility. Patch by sebb.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881606
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 23:00:31 +0000 (23:00 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48176
Make fields final. Patch by sebb.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881600
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:59:34 +0000 (22:59 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48175
Make loggers final. Patch by sebb with minor modification as original patch broke compilation
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881599
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:55:12 +0000 (22:55 +0000)]
Use standard modifier order
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881596
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:47:39 +0000 (22:47 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48174
Use final
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881591
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:46:41 +0000 (22:46 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48173
Use final
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881590
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:44:58 +0000 (22:44 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48151
Add missing AL2 headers
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881589
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:35:41 +0000 (22:35 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48150
Correct JavaDoc typos. Patch provided by gingyang.xu
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881582
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:33:58 +0000 (22:33 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48149
Correct JavaDoc typos. Patch provided by gingyang.xu
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881578
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:31:47 +0000 (22:31 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48148
Correct JavaDoc typos. Patch provided by gingyang.xu
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881577
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:27:58 +0000 (22:27 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48147
Correct JavaDoc typos. Patch provided by gingyang.xu
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881575
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:24:42 +0000 (22:24 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48146
Correct JavaDoc typos. Patch provided by gingyang.xu
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881574
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:13:30 +0000 (22:13 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48143
Javadoc updates. Patch provide by sebb.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881567
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 22:03:22 +0000 (22:03 +0000)]
Generics
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881562
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Tue, 17 Nov 2009 21:33:40 +0000 (21:33 +0000)]
Consolidation of protocol attributes into a base class
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881541
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 21:21:41 +0000 (21:21 +0000)]
Add @Override annotations
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881533
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 21:19:44 +0000 (21:19 +0000)]
Remove unused imports
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881532
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 21:17:32 +0000 (21:17 +0000)]
Remove some more deprecated code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881530
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 21:15:53 +0000 (21:15 +0000)]
Remove deprecated code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881528
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 20:53:32 +0000 (20:53 +0000)]
Add support for multipart config in web.xml (partially complete)
Review and fix issues in WebXml merge code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881503
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 20:49:48 +0000 (20:49 +0000)]
Fix an Eclipse warning
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881501
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 20:49:04 +0000 (20:49 +0000)]
Better handle edge cases when allowing = in cookie value
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881500
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 20:48:15 +0000 (20:48 +0000)]
Test some edge cases with = in cookie values (current code fails these tests - patch to follow shortly)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881499
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 20:30:39 +0000 (20:30 +0000)]
Update re-packaged commons-fileupload to 1.2.1
Done using svn copy from tags in commons so merging future updates should be easier
Changes made/required:
- All classes in a single renamed package
- Removed unused Util methods (so even more classes were not required)
- Removed some deprecated classes
There is almost certainly more to be done in terms of pruning to the minimum required. Will so that once Servlet 3 file upload has been implemented.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881493
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Tue, 17 Nov 2009 18:28:52 +0000 (18:28 +0000)]
Update comments and examples in catalina.policy file
Especially replace ${catalina.home} with ${catalina.base}
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881432
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 17:50:21 +0000 (17:50 +0000)]
Update to commons pool 1.5.4 (fix another regression)
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881412
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 17:39:51 +0000 (17:39 +0000)]
Update Javadoc to reflect changed default for useEquals
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881402
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Tue, 17 Nov 2009 17:35:57 +0000 (17:35 +0000)]
Make the file handler thread safe
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881396
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 02:41:55 +0000 (02:41 +0000)]
Update throws declaration for Servlet 3 file upload
Do the easy part of the implementation
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881109
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 17 Nov 2009 02:19:49 +0000 (02:19 +0000)]
Implement request.authenticate()
This required re-factoring the Authenticator interface to use HttpServletResponse. It would be nice to refactor to use HttpServletRequest as well but at the moment the authenticator requires too much access to the request internals.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@881100
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 16 Nov 2009 15:15:45 +0000 (15:15 +0000)]
Remove code that doesn't do anything
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@880786
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 15 Nov 2009 20:24:48 +0000 (20:24 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47495
Exit immediately if Catalina.load() failed to create a server instance.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836405
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sun, 15 Nov 2009 15:17:08 +0000 (15:17 +0000)]
correct a comment
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836371
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Sat, 14 Nov 2009 16:30:21 +0000 (16:30 +0000)]
Clear the values in username and password fields when they are read-only
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836209
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 14 Nov 2009 13:46:43 +0000 (13:46 +0000)]
Reduce visibility (thanks Sebb)
Remove unused code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836177
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 14 Nov 2009 03:47:48 +0000 (03:47 +0000)]
More cookie refactoring
- new support class for common elements of parsing and writing
- better consistency between parsing and writing
- remove unused code
- reduce visibility of methods where possible
- auto-switch to v1 for any attribute that might require quoting
- better names for constants
- allow v0 cookies to break http spec (disabled by default)
- update test cases and documentation
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836113
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 14 Nov 2009 02:48:51 +0000 (02:48 +0000)]
Correct comment
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836103
13f79535-47bb-0310-9956-
ffa450edef68
markt [Sat, 14 Nov 2009 02:48:19 +0000 (02:48 +0000)]
Add TODOs as per discussion on dev list
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836102
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Fri, 13 Nov 2009 22:49:09 +0000 (22:49 +0000)]
Do not offer default value for Tomcat administrator login
Also change/indent some labels
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836045
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Fri, 13 Nov 2009 22:35:49 +0000 (22:35 +0000)]
1. Correct some computations in "configure" Function:
a) Always set initial value for $R5
b) $R4 and $R0 have to be consistent when Silent mode is used
2. Correct some messages. Do not mention Windows NT etc., as Win98 is all history now.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836036
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 13 Nov 2009 22:22:50 +0000 (22:22 +0000)]
Add suspect test and also allow connections to be unwrapped
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836028
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 13 Nov 2009 21:53:13 +0000 (21:53 +0000)]
Implement suspectTimeout to allow JMX notifications and log events to take place if a connection is checked out for too long. But don't abandon/close the connection.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@836011
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Fri, 13 Nov 2009 20:12:32 +0000 (20:12 +0000)]
Use a safe default of the useEquals, works on any VM.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835974
13f79535-47bb-0310-9956-
ffa450edef68
markt [Fri, 13 Nov 2009 15:48:41 +0000 (15:48 +0000)]
Add Apple J2SE runtime jars to those we skip when scanning for TLDs and web fragments
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835886
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 12 Nov 2009 21:36:49 +0000 (21:36 +0000)]
Fix NPEs on startup with relative ordering and provide somewhere to store results of annotation scanning when that is implemented
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835567
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 12 Nov 2009 21:19:09 +0000 (21:19 +0000)]
Make handling of / as a separator consistent with the rest of the cookie code.
This actually relaxes treatment of / in cookie generation.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835552
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 12 Nov 2009 19:53:49 +0000 (19:53 +0000)]
Make TODO comments consistent to make them easier to find
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835516
13f79535-47bb-0310-9956-
ffa450edef68
markt [Thu, 12 Nov 2009 17:29:00 +0000 (17:29 +0000)]
Servlet 3 implementation.
- Add support for relative fragment ordering and some test cases
- Re-order fragment and annotation processing to match spec
- Implement login/logout
- Provide a method to retrieve the Authenticator in use by a Context
- Add methods to Authenticator interface to facilitate the new login/login methods
- Enable Authenticator.register() to be used for logout as well as login
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835460
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Thu, 12 Nov 2009 11:20:43 +0000 (11:20 +0000)]
Followup to r.817822 and r.833545
You have to specify explicit encoding in a fixcrlf task
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835336
13f79535-47bb-0310-9956-
ffa450edef68
fhanik [Wed, 11 Nov 2009 19:51:50 +0000 (19:51 +0000)]
Make the location of stdout and stderr output configurable. Leave the default as it always has been.
Currently, one can reconfigure the location of all logfiles except this one.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835036
13f79535-47bb-0310-9956-
ffa450edef68
costin [Wed, 11 Nov 2009 19:13:24 +0000 (19:13 +0000)]
Add similar SSL tests for NIO connector.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@835017
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Wed, 11 Nov 2009 07:56:01 +0000 (07:56 +0000)]
code formatting
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834794
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 10 Nov 2009 16:46:52 +0000 (16:46 +0000)]
Use new attribute name
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834541
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 10 Nov 2009 15:43:17 +0000 (15:43 +0000)]
Document allowUnsafeLegacyRenegotiation
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834510
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 10 Nov 2009 15:38:37 +0000 (15:38 +0000)]
Rename attribute
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834506
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 10 Nov 2009 15:33:50 +0000 (15:33 +0000)]
Prevent stack traces when closing ssl sockets after unwanted renegotiation attempt.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834504
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 10 Nov 2009 14:26:01 +0000 (14:26 +0000)]
Use a connector attribute rather than a system property to control renegotiation
Fix some trivial Eclispe warnings in the test
Don't try and invalidate the session in the client - an attacker probably won't do this
Add a test that checks the connector attribute can be used to enable renegotiation
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834477
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 10 Nov 2009 13:40:08 +0000 (13:40 +0000)]
Fix some minor Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834461
13f79535-47bb-0310-9956-
ffa450edef68
costin [Tue, 10 Nov 2009 04:54:34 +0000 (04:54 +0000)]
Invalidate the session - so it can't be resumed.
Not sure what else we can do using this hook - we could switch to SSLEngine, but that's pretty large change.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834340
13f79535-47bb-0310-9956-
ffa450edef68
costin [Tue, 10 Nov 2009 01:04:13 +0000 (01:04 +0000)]
Test case for the MITM/ssl re-negotiation, also a unit test for a simple ssl request
( to check the fix didn't broke anything and ssl still works )
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834290
13f79535-47bb-0310-9956-
ffa450edef68
costin [Tue, 10 Nov 2009 01:02:43 +0000 (01:02 +0000)]
Fix for the SSL midm - disable client re-negotiation, connection will be closed.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834289
13f79535-47bb-0310-9956-
ffa450edef68
markt [Tue, 10 Nov 2009 00:31:25 +0000 (00:31 +0000)]
Add merge code for the remaining elements in web.xml
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834286
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 21:18:01 +0000 (21:18 +0000)]
Align all three StringManager implementations
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834238
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 21:06:37 +0000 (21:06 +0000)]
StringManagers should be static final
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834233
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 21:00:22 +0000 (21:00 +0000)]
StringManagers should be final
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834229
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 20:52:49 +0000 (20:52 +0000)]
Unused code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834227
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 20:51:17 +0000 (20:51 +0000)]
Loggers should be final
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834226
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 20:43:47 +0000 (20:43 +0000)]
The assumption that contexts will always be file system based or that resources will always be extracted to the work does not hold true, particularly for custom DirContext implementations. Don't make the assumption and clean-up up the redundant field that is no longer required.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834220
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Mon, 9 Nov 2009 15:08:50 +0000 (15:08 +0000)]
Remove unused inner class
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834099
13f79535-47bb-0310-9956-
ffa450edef68
kkolinko [Mon, 9 Nov 2009 15:04:07 +0000 (15:04 +0000)]
With rev.834080 WebappClassLoader#findResourceInternal(String,String) is always called with AccessController.doPrivileged(), thus there is no need to wrap #findResourceInternal(File,String) call that is inside it.
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834096
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 14:33:03 +0000 (14:33 +0000)]
Remove unnecessary code
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834082
13f79535-47bb-0310-9956-
ffa450edef68
markt [Mon, 9 Nov 2009 14:31:40 +0000 (14:31 +0000)]
Patch provided by Cyrille Le Clerc
* fix NPE in log statement if protocolHeader has not been defined and the servlet container does not support request.getHeader(null)
* fix mismatch between javadoc and code for filter parameter name "allowedInternalProxies" -> "internalProxies"
* finish javadoc refactoring "XForwardedFilter" -> "RemoteIpFilter"
Also fix some Eclipse warnings
git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@834081
13f79535-47bb-0310-9956-
ffa450edef68