tomcat7.0
14 years agoUpdate changelog
markt [Tue, 5 Jul 2011 12:28:50 +0000 (12:28 +0000)]
Update changelog

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

14 years agoRemove unused code
markt [Tue, 5 Jul 2011 12:26:09 +0000 (12:26 +0000)]
Remove unused code

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

14 years agoBased on current usage within Tomcat, message length of 0 should result in null.
markt [Tue, 5 Jul 2011 12:25:38 +0000 (12:25 +0000)]
Based on current usage within Tomcat, message length of 0 should result in null.
Populate the test for this and ensure the test passes.

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

14 years agoRemove main method
markt [Tue, 5 Jul 2011 12:22:03 +0000 (12:22 +0000)]
Remove main method

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

14 years agoRemove ununsed methods.
markt [Tue, 5 Jul 2011 12:21:37 +0000 (12:21 +0000)]
Remove ununsed methods.
Convert from using main() to a unit test
Use valid test data

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

14 years agoMove working JUnit tests to align with package of class being tested.
markt [Tue, 5 Jul 2011 12:06:04 +0000 (12:06 +0000)]
Move working JUnit tests to align with package of class being tested.

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

14 years agoLimit exclusion to 'old' tests so tests added to o.a.catalina.tribes will execute
markt [Tue, 5 Jul 2011 11:36:41 +0000 (11:36 +0000)]
Limit exclusion to 'old' tests so tests added to o.a.catalina.tribes will execute

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

14 years agoRevert r1142953. The analysis was incorrect.
markt [Tue, 5 Jul 2011 10:42:15 +0000 (10:42 +0000)]
Revert r1142953. The analysis was incorrect.

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

14 years agoFix response.encodeURL() for the special case of
rjung [Tue, 5 Jul 2011 10:08:00 +0000 (10:08 +0000)]
Fix response.encodeURL() for the special case of
an absolute URL with no path segment (http://name).

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
markt [Tue, 5 Jul 2011 10:03:06 +0000 (10:03 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51472
Correctly test modifiers when resolving bean methods with the BeanELResolver.
Patch provided by Friedhelm Kuehn.

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

14 years agoFurther improvements to the Windows installer
kkolinko [Tue, 5 Jul 2011 08:31:52 +0000 (08:31 +0000)]
Further improvements to the Windows installer
1. Install into "**/Tomcat7.0_servicename" when service name differs from default,
but install into "**/Tomcat7.0" if the name is the default one.
This is to be in line with 7.0.16 and earlier versions, but
differs from 7.0.17 which used "**/Tomcat7.0/servicename".
2. Changed name of registry key for running of Tomcat Monitor
3. Do not forget to delete Tomcat Monitor running entry from HKCU in 32-bit part of registry

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473
kkolinko [Tue, 5 Jul 2011 07:10:31 +0000 (07:10 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51473
Fix concatenation of values in SecurityConfig.setSecurityProperty()
when the value provided by JRE is null.

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

14 years agoValidate Windows service name
markt [Mon, 4 Jul 2011 20:05:26 +0000 (20:05 +0000)]
Validate Windows service name

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

14 years agoCorrect regression caused by connector re-factoring that made AJP
markt [Mon, 4 Jul 2011 17:46:15 +0000 (17:46 +0000)]
Correct regression caused by connector re-factoring that made AJP
APR/native connector very unstable on Windows platforms.

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 14:08:42 +0000 (14:08 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 14:05:43 +0000 (14:05 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 14:02:36 +0000 (14:02 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:59:53 +0000 (13:59 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:54:52 +0000 (13:54 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:51:26 +0000 (13:51 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:41:43 +0000 (13:41 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:37:22 +0000 (13:37 +0000)]
Add @Override annotation

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

14 years agoFix "potential null pointer access warning".
kkolinko [Mon, 4 Jul 2011 13:34:48 +0000 (13:34 +0000)]
Fix "potential null pointer access warning".

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

14 years agoFix "potential null pointer access warning".
kkolinko [Mon, 4 Jul 2011 13:29:44 +0000 (13:29 +0000)]
Fix "potential null pointer access warning".
As a bonus, it avoids allocating char[] buffer for an empty string.
Add $FALL-THROUGH$ comment where we fall through to the next label in switch().

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

14 years agoFix a small number of warnings
markt [Mon, 4 Jul 2011 13:28:11 +0000 (13:28 +0000)]
Fix a small number of warnings

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:21:29 +0000 (13:21 +0000)]
Add @Override annotation

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

14 years agoAdd @Override annotation
kkolinko [Mon, 4 Jul 2011 13:12:31 +0000 (13:12 +0000)]
Add @Override annotation

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

14 years agoRemove publicId field from SchemaResolver class,
kkolinko [Mon, 4 Jul 2011 13:10:38 +0000 (13:10 +0000)]
Remove publicId field from SchemaResolver class,
because is never read and is not cleared when digester is reused.
If anyone needs this, this value is available by calling SchemaResolver.digester.getPublicId().

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51467
markt [Mon, 4 Jul 2011 12:50:24 +0000 (12:50 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51467
start() not run()
Patch provided by Felix Schumacher

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51466
markt [Mon, 4 Jul 2011 12:43:19 +0000 (12:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51466
Fix typos
Patch by Felix Schumacher

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

14 years agoFix possible NPE
markt [Sun, 3 Jul 2011 13:15:58 +0000 (13:15 +0000)]
Fix possible NPE

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

14 years agoStart the 7.0.18 changelog
markt [Sat, 2 Jul 2011 21:59:37 +0000 (21:59 +0000)]
Start the 7.0.18 changelog

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

14 years agoFix Eclipse warnings in the o.a.c.startup package
markt [Sat, 2 Jul 2011 21:57:12 +0000 (21:57 +0000)]
Fix Eclipse warnings in the o.a.c.startup package

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

14 years agoRemove dead code
markt [Sat, 2 Jul 2011 21:52:35 +0000 (21:52 +0000)]
Remove dead code

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

14 years agoFix generics warnings
markt [Sat, 2 Jul 2011 21:51:14 +0000 (21:51 +0000)]
Fix generics warnings

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

14 years agoFix Javadoc warnings spotted in 7.0.17 build
markt [Sat, 2 Jul 2011 21:44:32 +0000 (21:44 +0000)]
Fix Javadoc warnings spotted in 7.0.17 build

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

14 years agoUpdate ready for for next release
markt [Sat, 2 Jul 2011 21:37:05 +0000 (21:37 +0000)]
Update ready for for next release

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

14 years agoOnly add instance if it has just been created.
markt [Sat, 2 Jul 2011 12:01:30 +0000 (12:01 +0000)]
Only add instance if it has just been created.

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

14 years agoCorrect deadlock introduced in r1142112
markt [Sat, 2 Jul 2011 11:29:46 +0000 (11:29 +0000)]
Correct deadlock introduced in r1142112

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

14 years agoWhen using Servlets that implement the SingleThreadModel interface, add the single...
markt [Fri, 1 Jul 2011 22:47:46 +0000 (22:47 +0000)]
When using Servlets that implement the SingleThreadModel interface, add the single instance created to the pool when it is determined that a pool of servlets is required rather than throwing it away.

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

14 years agoPrevent test failures when two objects get generated with the same hashCode
markt [Fri, 1 Jul 2011 22:44:04 +0000 (22:44 +0000)]
Prevent test failures when two objects get generated with the same hashCode

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

14 years agoRead/write by multiple threads outside sync - needs to be volatile
markt [Fri, 1 Jul 2011 21:50:14 +0000 (21:50 +0000)]
Read/write by multiple threads outside sync - needs to be volatile

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

14 years agoIn Tomcat.initBaseDir():
kkolinko [Fri, 1 Jul 2011 20:20:33 +0000 (20:20 +0000)]
In Tomcat.initBaseDir():
set a value for catalina.home only if it has not been set previously.

Without this fix, I guess, you won't be able to run embedded Tomcat with
separate catalina.base and catalina.home.

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

14 years agoFollowup to r1140693
kkolinko [Fri, 1 Jul 2011 19:46:00 +0000 (19:46 +0000)]
Followup to r1140693
Declare a separate public method for the new use case of makeJavaIdentifier(),
instead of passing the "false" flag as an argument.

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

14 years agoAdd support for configuring the shutdown port
markt [Fri, 1 Jul 2011 18:06:08 +0000 (18:06 +0000)]
Add support for configuring the shutdown port

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

14 years agoBuild server.xml for the installer by search and replace rather than combining fragme...
markt [Fri, 1 Jul 2011 17:35:09 +0000 (17:35 +0000)]
Build server.xml for the installer by search and replace rather than combining fragments. No ore work to keep the original and the fragments in sync and esy to expand to add additional search/replace as well as insertions etc.

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

14 years agoUse specified AJP port rather than always using default
markt [Fri, 1 Jul 2011 16:25:28 +0000 (16:25 +0000)]
Use specified AJP port rather than always using default

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

14 years agoConsistent reporting for the connectors
markt [Fri, 1 Jul 2011 14:52:24 +0000 (14:52 +0000)]
Consistent reporting for the connectors

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

14 years agoFix possible NPE when serving STM servlets
markt [Fri, 1 Jul 2011 14:15:48 +0000 (14:15 +0000)]
Fix possible NPE when serving STM servlets

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

14 years agoIf things go wrong, don't wait forever for the latch.
markt [Fri, 1 Jul 2011 14:05:00 +0000 (14:05 +0000)]
If things go wrong, don't wait forever for the latch.

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

14 years agoFix faulty test
markt [Fri, 1 Jul 2011 13:41:25 +0000 (13:41 +0000)]
Fix faulty test

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

14 years agoSeen on Windows too (less frequently)
markt [Fri, 1 Jul 2011 10:03:04 +0000 (10:03 +0000)]
Seen on Windows too (less frequently)

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51453
markt [Thu, 30 Jun 2011 15:41:27 +0000 (15:41 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51453
Fix a regression in the preemptive authentication support (enhancement <bug>12428</bug>) that could trigger authentication even if preemptive authentication was disabled.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51445
markt [Thu, 30 Jun 2011 12:16:37 +0000 (12:16 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51445
Correctly initialise all instances of Servlets that implement SingleThreadModel.
Based on a patch by Felix Schumacher.

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

14 years agoImprove the handling for Servlets that implement the deprecated SingleThreadModel...
markt [Thu, 30 Jun 2011 11:58:36 +0000 (11:58 +0000)]
Improve the handling for Servlets that implement the deprecated SingleThreadModel when embedding Tomcat.

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

14 years agoThe change in session ID is notified to the container event listener.
kfujino [Thu, 30 Jun 2011 08:39:53 +0000 (08:39 +0000)]
The change in session ID is notified to the container event listener.

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

14 years agoFix bad logic. Need to postProcess if socket is *not* closed and it is an async request.
markt [Wed, 29 Jun 2011 22:34:37 +0000 (22:34 +0000)]
Fix bad logic. Need to postProcess if socket is *not* closed and it is an async request.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51450
markt [Wed, 29 Jun 2011 15:16:02 +0000 (15:16 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51450
More Spanish translations.
Based on a patch by Jesus Marin.

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

14 years agoBetter error handling that may help track down the cause of https://issues.apache...
markt [Wed, 29 Jun 2011 13:56:28 +0000 (13:56 +0000)]
Better error handling that may help track down the cause of https://issues.apache.org/bugzilla/show_bug.cgi?id=51088

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

14 years agoEnsure that if asyncDispatch() is called during an onTimeout event and the target...
markt [Wed, 29 Jun 2011 12:57:50 +0000 (12:57 +0000)]
Ensure that if asyncDispatch() is called during an onTimeout event and the target Servlet does not call startAsync() or complete() that Tomcat calls complete() (or does the equivalent) once the target Servlet exits.

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

14 years agoEnsure an access log entry is made if an error occurs during asynchronous request...
markt [Wed, 29 Jun 2011 12:12:48 +0000 (12:12 +0000)]
Ensure an access log entry is made if an error occurs during asynchronous request processing and the socket is immediately closed.

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

14 years agoIf the socket is closed (i.e. due to an error) no need to postProcess
markt [Wed, 29 Jun 2011 11:19:55 +0000 (11:19 +0000)]
If the socket is closed (i.e. due to an error) no need to postProcess

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

14 years agoFix what were originally typos
markt [Wed, 29 Jun 2011 00:06:20 +0000 (00:06 +0000)]
Fix what were originally typos
Similar to https://issues.apache.org/bugzilla/show_bug.cgi?id=50648

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

14 years agoFix what was originally a typo
markt [Tue, 28 Jun 2011 23:45:52 +0000 (23:45 +0000)]
Fix what was originally a typo
Similar to https://issues.apache.org/bugzilla/show_bug.cgi?id=50648

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51443
markt [Tue, 28 Jun 2011 19:35:06 +0000 (19:35 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51443
Document the notifySessionListenersOnReplication attribute for the DeltaManager.

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

14 years agoNotifications of changes in session ID to other nodes in the cluster should be contro...
markt [Tue, 28 Jun 2011 19:32:39 +0000 (19:32 +0000)]
Notifications of changes in session ID to other nodes in the cluster should be controlled by notifySessionListenersOnReplication rather than notifyListenersOnReplication.

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

14 years agoAdded symmetric sslAvailable=false in terminateAPR.
schultz [Tue, 28 Jun 2011 18:55:57 +0000 (18:55 +0000)]
Added symmetric sslAvailable=false in terminateAPR.

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

14 years agoAdd a test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=51445
markt [Tue, 28 Jun 2011 18:00:50 +0000 (18:00 +0000)]
Add a test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=51445

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51436
markt [Tue, 28 Jun 2011 17:49:25 +0000 (17:49 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51436
Send 100 (Continue) response earlier to enable ServletRequestListener implementations to read the request body.
Based on a patch by Simon Olofsson.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50353
markt [Tue, 28 Jun 2011 17:24:45 +0000 (17:24 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50353
Rather than the eventual NPE, throw an ISE if an application attempts to access an AsyncContext after the request processing has ended.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51447
markt [Tue, 28 Jun 2011 16:22:08 +0000 (16:22 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51447
Viewing a back up session in the HTML Manager web application no longer changes the session to a primary session.
Based on a patch provided by Eiji Takahashi.

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

14 years agoMore https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 related changes
markt [Tue, 28 Jun 2011 16:06:32 +0000 (16:06 +0000)]
More https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 related changes
Based on a patch by Konstantin Preißer

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

14 years agoAdditional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=36362 to addres...
markt [Tue, 28 Jun 2011 15:56:23 +0000 (15:56 +0000)]
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=36362 to address regression for attributes with names that include underscores

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

14 years agoIncrease size of file the test tries to send since there is enough buffering on my...
markt [Tue, 28 Jun 2011 14:37:59 +0000 (14:37 +0000)]
Increase size of file the test tries to send since there is enough buffering on my system that 200k can hide in the buffers triggering a test failure (the limit works - it just fails in a way the test doesn't expect)

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

14 years agoIncrease size of file the test tries to send since there is enough buffering on my...
markt [Tue, 28 Jun 2011 13:57:17 +0000 (13:57 +0000)]
Increase size of file the test tries to send since there is enough buffering on my system that 200k can hide in the buffers triggering a test failure (the limit works - it just fails in a way the test doesn't expect)

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

14 years agoFix the remaining instances of new String(byte[] b, String enc) that can be fixed
markt [Tue, 28 Jun 2011 07:22:28 +0000 (07:22 +0000)]
Fix the remaining instances of new String(byte[] b, String enc) that can be fixed

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

14 years agoNo need for a ConcurrentHashMap now pre-population is used.
markt [Tue, 28 Jun 2011 07:15:02 +0000 (07:15 +0000)]
No need for a ConcurrentHashMap now pre-population is used.

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

14 years agoUpdate for recent changes
markt [Mon, 27 Jun 2011 23:12:10 +0000 (23:12 +0000)]
Update for recent changes

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

14 years agoUse a more reliable method to expire sessions.
markt [Mon, 27 Jun 2011 22:13:39 +0000 (22:13 +0000)]
Use a more reliable method to expire sessions.

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

14 years agoSimplify.
markt [Mon, 27 Jun 2011 16:01:32 +0000 (16:01 +0000)]
Simplify.
Covert aliases to lower case too.

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

14 years agoNeed to include aliases in charset cache
markt [Mon, 27 Jun 2011 15:19:22 +0000 (15:19 +0000)]
Need to include aliases in charset cache

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

14 years agoRemove upgrading info - it has been added to the site
markt [Mon, 27 Jun 2011 15:11:45 +0000 (15:11 +0000)]
Remove upgrading info - it has been added to the site

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

14 years agoRemove unused files
markt [Mon, 27 Jun 2011 13:57:23 +0000 (13:57 +0000)]
Remove unused files

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

14 years agoPre-populate Charset cache.
markt [Mon, 27 Jun 2011 13:39:13 +0000 (13:39 +0000)]
Pre-populate Charset cache.
Since cache is pre-populated, no need to look up non-matching values which effectively caches misses too.

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

14 years agoPrevent multiple variations of the same sncoding filling up the cache
markt [Mon, 27 Jun 2011 13:23:28 +0000 (13:23 +0000)]
Prevent multiple variations of the same sncoding filling up the cache

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

14 years agoFix typo
markt [Mon, 27 Jun 2011 10:23:45 +0000 (10:23 +0000)]
Fix typo

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

14 years agoFix CVE-2011-2204.
markt [Mon, 27 Jun 2011 09:27:06 +0000 (09:27 +0000)]
Fix CVE-2011-2204.
Prevent user passwords appearing in log files if a runtime exception (e.g. OOME) occurs while creating a new user for a MemoryUserDatabase via JMX.

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

14 years agoUse "eval exec" instead of "eval" for
rjung [Sun, 26 Jun 2011 18:34:10 +0000 (18:34 +0000)]
Use "eval exec" instead of "eval" for
"catalina.sh run".

Originally it was "exec" before we switched to "eval"
which leaves an additional intermediate shell process
hanging around.

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

14 years agoAdd an upgrade page to the documentation that can be used to determine the changes...
markt [Sat, 25 Jun 2011 17:47:46 +0000 (17:47 +0000)]
Add an upgrade page to the documentation that can be used to determine the changes in any of the configuration files between two given versions.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
markt [Fri, 24 Jun 2011 16:43:40 +0000 (16:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
Provide the ability to specify the AJP port and service name when installing Tomcat using the Windows installer. This permits multiple instances of the same Tomcat version to be installed side-by-side.

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

14 years agoDisable the shutdown port when running as a service. One less port to conflict when...
markt [Fri, 24 Jun 2011 15:22:30 +0000 (15:22 +0000)]
Disable the shutdown port when running as a service. One less port to conflict when installing multiple services.

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

14 years agoRemove unused code
markt [Fri, 24 Jun 2011 13:25:25 +0000 (13:25 +0000)]
Remove unused code

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

14 years agoFix IllegalStateException for JavaScript files
rjung [Fri, 24 Jun 2011 12:48:20 +0000 (12:48 +0000)]
Fix IllegalStateException for JavaScript files
when switching from Writer to OutputStream.

The special handling of this case in the
DefaultServlet was broken due to a MIME type
change for JavaScript.

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

14 years agoCorrectly support 'S' and 'SSS' in SimpleDateFormat
rjung [Fri, 24 Jun 2011 05:39:19 +0000 (05:39 +0000)]
Correctly support 'S' and 'SSS' in SimpleDateFormat
timestamps for the AccessLogValve.

We prefer "msec_frac" as documented, but the common
other cases should at least work.

Other multiples of the 'S' formatting character
will produce bogus results (but don't make much
sense either).

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

14 years agoRemove dead code and correct comment about
rjung [Fri, 24 Jun 2011 05:33:35 +0000 (05:33 +0000)]
Remove dead code and correct comment about
thread-safetyness.

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

14 years agoPrep for fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
markt [Thu, 23 Jun 2011 23:24:36 +0000 (23:24 +0000)]
Prep for fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
Use a variable for the service name and ensure the uninstaller still works

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

14 years agoUse a function to start the service so the service name can be changed during the...
markt [Thu, 23 Jun 2011 22:35:22 +0000 (22:35 +0000)]
Use a function to start the service so the service name can be changed during the install

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

14 years agoRemove inaccurate comment
markt [Thu, 23 Jun 2011 22:25:12 +0000 (22:25 +0000)]
Remove inaccurate comment

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=40510
markt [Thu, 23 Jun 2011 22:01:41 +0000 (22:01 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40510
Provide an option to install shortcuts for the current user or all users. Also ensure registry is correctly cleaned on uninstall for 64-bit platforms.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=33262
markt [Thu, 23 Jun 2011 18:27:39 +0000 (18:27 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=33262
Install monitor to auto-start for current user only rather than all users to be consistent with menu item creation.

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