tomcat7.0
16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47308
fhanik [Thu, 18 Jun 2009 17:08:38 +0000 (17:08 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47308
Patch provided by Keiichi Fujino with one change, default is false

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

16 years agoFix demo
fhanik [Thu, 18 Jun 2009 16:57:17 +0000 (16:57 +0000)]
Fix demo

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389
fhanik [Thu, 18 Jun 2009 15:27:55 +0000 (15:27 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47389
patch provided by  Keiichi Fujino

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

16 years agoAdd volatiles as suggested by Tim to align code with AccessLogValve.
markt [Thu, 18 Jun 2009 12:58:07 +0000 (12:58 +0000)]
Add volatiles as suggested by Tim to align code with AccessLogValve.
No significant change to results (on my machine at least ;)

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

16 years agoExpand sync within rotatable block to fix a couple of issues:
markt [Thu, 18 Jun 2009 09:25:00 +0000 (09:25 +0000)]
Expand sync within rotatable block to fix a couple of issues:
 - fileDateFormatter is a SimpleDateFormat which is not thread safe
 - the rotationLastChecked needs to be volatile to ensure we don't execute the sync'd block multiple times
Although this is a sync on 'this' in log which gets called for every request:
 - a similar sync occurs in getDate() for every request with minimal performance impact
 - microbenchmarks suggest that a sync on 'this' has similar performance to using ThreadLocals

 Based on kkolinko's patch for Tomcat 5.5.x

 Note there remains an issue with writing to the log if the log files happens to be in the process of rotating

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

16 years agoAdd some micro-benchmarks that enable the differences between the Sync and ThreadLoca...
markt [Thu, 18 Jun 2009 08:32:29 +0000 (08:32 +0000)]
Add some micro-benchmarks that enable the differences between the Sync and ThreadLocal approach to be compared

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

16 years agoIt is followup to rev.785768.
kkolinko [Wed, 17 Jun 2009 23:52:11 +0000 (23:52 +0000)]
It is followup to rev.785768.
Updating the comment in the web.xml to align with the docs.
We know that this version of Tomcat cannot run on JDK 1.4.

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

16 years agoDisable the code that detects the value for compilerSourceVM, compilerTargetVM options,
kkolinko [Wed, 17 Jun 2009 19:58:30 +0000 (19:58 +0000)]
Disable the code that detects the value for compilerSourceVM, compilerTargetVM options,
because we know that this version of Tomcat cannot run on JDK 1.4.
Update the doc.

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

16 years agotrivial: corrected spelling errors in docs
kkolinko [Wed, 17 Jun 2009 15:51:55 +0000 (15:51 +0000)]
trivial: corrected spelling errors in docs

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

16 years agoAdd common FindCpuType function.
mturk [Wed, 17 Jun 2009 05:33:52 +0000 (05:33 +0000)]
Add common FindCpuType function.
The problem is that environment variable doesn't always set AMD64. This is true only for amd processors.
If present and not IA64 the %PROCESSOR_ARCHITEW6432% must be x86_64

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=37794
markt [Tue, 16 Jun 2009 20:30:43 +0000 (20:30 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=37794
Handle chunked POSTs. If maxPostSize is exceeded, a 500 results.

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

16 years agoBetter comment
markt [Tue, 16 Jun 2009 20:28:08 +0000 (20:28 +0000)]
Better comment

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

16 years agoTest case for bug 37794.
markt [Tue, 16 Jun 2009 20:18:14 +0000 (20:18 +0000)]
Test case for bug 37794.
The generic code will move out of this class if it turns out to be useful for other test cases

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

16 years agoExclude windows binaries from the .zip and .tar.gz packages
mturk [Tue, 16 Jun 2009 15:09:50 +0000 (15:09 +0000)]
Exclude windows binaries from the .zip and .tar.gz packages

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

16 years agoFix tomcat installer script by using the correct files and new locations.
mturk [Tue, 16 Jun 2009 14:51:50 +0000 (14:51 +0000)]
Fix tomcat installer script by using the correct files and new locations.
Also decide which version of tcnative-1.dll to install according to the CPU architecture

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

16 years agoExclude service.bat from package-zip and package-tgz.
mturk [Tue, 16 Jun 2009 14:18:26 +0000 (14:18 +0000)]
Exclude service.bat from package-zip and package-tgz.
It is now part of package-native, since it is only usable together with service wrapper

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

16 years agoAdd package-natives target
mturk [Tue, 16 Jun 2009 10:37:05 +0000 (10:37 +0000)]
Add package-natives target

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

16 years agoFix nested tasks for download
mturk [Tue, 16 Jun 2009 10:09:41 +0000 (10:09 +0000)]
Fix nested tasks for download

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

16 years agoDownload IA64 tcnative-1.dll as well
mturk [Tue, 16 Jun 2009 07:06:11 +0000 (07:06 +0000)]
Download IA64 tcnative-1.dll as well

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

16 years agoMerge tests into main build.xml as an optional target.
markt [Mon, 15 Jun 2009 18:58:55 +0000 (18:58 +0000)]
Merge tests into main build.xml as an optional target.
Hopefully start to use Tomcat class as basis for test cases for bugs.

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

16 years agoDefault appBase change was causing errors. Use the old value for this test case.
markt [Mon, 15 Jun 2009 18:55:48 +0000 (18:55 +0000)]
Default appBase change was causing errors. Use the old value for this test case.

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

16 years agoFix comments
markt [Mon, 15 Jun 2009 18:55:00 +0000 (18:55 +0000)]
Fix comments

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

16 years agoAdd missing pom
fhanik [Mon, 15 Jun 2009 18:31:08 +0000 (18:31 +0000)]
Add missing pom

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47369
fhanik [Mon, 15 Jun 2009 17:35:07 +0000 (17:35 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47369
Patch provided by Keiichi Fujino

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

16 years agochecked in the raw license
fhanik [Mon, 15 Jun 2009 17:25:29 +0000 (17:25 +0000)]
checked in the raw license

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

16 years agoFix documentation
fhanik [Mon, 15 Jun 2009 17:22:55 +0000 (17:22 +0000)]
Fix documentation

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

16 years agoFix copyright year
fhanik [Mon, 15 Jun 2009 17:00:57 +0000 (17:00 +0000)]
Fix copyright year

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

16 years agoCorrect name
fhanik [Mon, 15 Jun 2009 16:49:24 +0000 (16:49 +0000)]
Correct name

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

16 years agoAdd in NOTICE and LICENSE file. Fix the links in the documentation.
fhanik [Mon, 15 Jun 2009 16:46:37 +0000 (16:46 +0000)]
Add in NOTICE and LICENSE file. Fix the links in the documentation.

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

16 years agoAdd in relative path to the left side menu. It's . by default so no changes. But...
fhanik [Mon, 15 Jun 2009 16:43:27 +0000 (16:43 +0000)]
Add in relative path to the left side menu. It's . by default so no changes. But this lets one generate docs and point to a location.

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

16 years agoSorry for the noise - finger trouble
markt [Mon, 15 Jun 2009 16:32:28 +0000 (16:32 +0000)]
Sorry for the noise - finger trouble

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

16 years agoOpps. Shouldn't have renamed this.
markt [Mon, 15 Jun 2009 16:30:40 +0000 (16:30 +0000)]
Opps. Shouldn't have renamed this.

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

16 years agoOpps. Shouldn't have renamed this.
markt [Mon, 15 Jun 2009 16:23:19 +0000 (16:23 +0000)]
Opps. Shouldn't have renamed this.

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

16 years agoPartly address bug 47124: Name unit tests consistently.
markt [Mon, 15 Jun 2009 16:21:22 +0000 (16:21 +0000)]
Partly address bug 47124: Name unit tests consistently.
All JUnit test cases are named Test*. There was at least one class named Test* that was not a JUnit test case. These were renamed *Test.
Helper / stub implementations are named Tester*

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

16 years agoRemove some unused Jasper code.
markt [Mon, 15 Jun 2009 16:07:20 +0000 (16:07 +0000)]
Remove some unused Jasper code.

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

16 years agoAlign programmatic web.xml defaults with conf/web.xml
markt [Mon, 15 Jun 2009 15:13:22 +0000 (15:13 +0000)]
Align programmatic web.xml defaults with conf/web.xml
Don't set anything that is already set by default
Switch to a context listener for the defaults so they get applied on re-load

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

16 years agoRemove more unused, deprecated code in Jasper
markt [Mon, 15 Jun 2009 13:05:38 +0000 (13:05 +0000)]
Remove more unused, deprecated code in Jasper

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

16 years agoRemove unused, deprecated code in Jasper
markt [Mon, 15 Jun 2009 13:04:18 +0000 (13:04 +0000)]
Remove unused, deprecated code in Jasper

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

16 years agoRemove deprecated Ant tasks
markt [Mon, 15 Jun 2009 12:31:54 +0000 (12:31 +0000)]
Remove deprecated Ant tasks

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

16 years agofix misprints in comments and javadoc
kkolinko [Sun, 14 Jun 2009 20:26:27 +0000 (20:26 +0000)]
fix misprints in comments and javadoc

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

16 years agoDo not increment access counter.
kkolinko [Sun, 14 Jun 2009 18:50:59 +0000 (18:50 +0000)]
Do not increment access counter.
The valve updates access time, but it should not increment access counter without decrementing it.

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

16 years agoRemove case insensitivity option. It was a workaround for a change in Tomcat 3 and...
markt [Sat, 13 Jun 2009 19:19:18 +0000 (19:19 +0000)]
Remove case insensitivity option. It was a workaround for a change in Tomcat 3 and has security implications if used on case insensitive file systems.

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

16 years agoEnhancements to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43343...
markt [Sat, 13 Jun 2009 19:05:56 +0000 (19:05 +0000)]
Enhancements to fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43343 based on kkolinko's review

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

16 years agoMore error checking
markt [Fri, 12 Jun 2009 16:45:34 +0000 (16:45 +0000)]
More error checking

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

16 years agoFix typo. Add aliases to changelog
markt [Fri, 12 Jun 2009 16:45:10 +0000 (16:45 +0000)]
Fix typo. Add aliases to changelog

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

16 years agoImplement alias resources. Key features:
markt [Fri, 12 Jun 2009 11:38:29 +0000 (11:38 +0000)]
Implement alias resources. Key features:
- configured at the context level in the same way as the other resource related attributes
- maps paths to directories or WAR files (single files not supported)

Implementation notes:
- Correct results for getRealPath() required this to be pushed down to the BaseDirContext as the short-cuts previously used needed to take account of any aliases. This in turn meant an addition to the Context interface
- Thanks to Tim F. The configuration format is all his idea

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

16 years agoCode clean-up.
markt [Fri, 12 Jun 2009 11:13:36 +0000 (11:13 +0000)]
Code clean-up.

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

16 years agoCode clean-up.
markt [Fri, 12 Jun 2009 11:11:57 +0000 (11:11 +0000)]
Code clean-up.

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

16 years agoCode clean-up. Fix a few warnings.
markt [Fri, 12 Jun 2009 11:10:02 +0000 (11:10 +0000)]
Code clean-up. Fix a few warnings.

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

16 years agoRemove unused code
markt [Fri, 12 Jun 2009 10:58:15 +0000 (10:58 +0000)]
Remove unused code

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

16 years agoFix typo in the docs.
markt [Thu, 11 Jun 2009 22:41:53 +0000 (22:41 +0000)]
Fix typo in the docs.

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

16 years agoThere are no 64-bit GUI binaries. (see rev.779927,-28,-30)
kkolinko [Thu, 11 Jun 2009 21:53:34 +0000 (21:53 +0000)]
There are no 64-bit GUI binaries. (see rev.779927,-28,-30)
The 32-bit version can manage both 32 and 64 bit tomcat(X).exe
Updating the build scripts accordingly.

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

16 years agoRemove some experimental code
markt [Thu, 11 Jun 2009 20:23:37 +0000 (20:23 +0000)]
Remove some experimental code

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

16 years agoProvide documentation for deployer.
kkolinko [Thu, 11 Jun 2009 17:51:08 +0000 (17:51 +0000)]
Provide documentation for deployer.

We do not have "printer" versions of our documentation pages anymore,
so I am using the common version.
Also, I removed "failonerror=false" flag, and removed renaming of the document. I see no point in renaming it. It was moved to the root folder, to remain relative to the images.

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

16 years agoThis was moved to the context
markt [Thu, 11 Jun 2009 16:43:37 +0000 (16:43 +0000)]
This was moved to the context

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

16 years agoDocument emptySessionPath behavior
fhanik [Thu, 11 Jun 2009 16:37:20 +0000 (16:37 +0000)]
Document emptySessionPath behavior

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

16 years agoExperiment with the UCDetector (Unused Code Detector) plug-in for Eclipse.
markt [Thu, 11 Jun 2009 14:16:49 +0000 (14:16 +0000)]
Experiment with the UCDetector (Unused Code Detector) plug-in for Eclipse.
Remove all the code from the class that isn't used anywhere in Tomcat.

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47343
markt [Thu, 11 Jun 2009 13:48:42 +0000 (13:48 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47343
Regression in https://issues.apache.org/bugzilla/show_bug.cgi?id=42747
context.xml can now be edited without resources being deleted

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

16 years agoFix download task dependency for commons-pool and commons-dbcp.
kkolinko [Thu, 11 Jun 2009 13:35:20 +0000 (13:35 +0000)]
Fix download task dependency for commons-pool and commons-dbcp.

Without this patch the 'ant download' call does not download
the updated commons-pool or commons-dbcp version,
like the recent update of commons-pool 1.4 -> 1.5,
unless you delete existing ${tomcat-dbcp.jar} file before that.

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

16 years agoLog context deployment consistently at info level, regardless of war/dir/xml
markt [Thu, 11 Jun 2009 13:13:09 +0000 (13:13 +0000)]
Log context deployment consistently at info level, regardless of war/dir/xml

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

16 years agoProvide a little more information in the logs when parameters are invalid. Speeds...
markt [Thu, 11 Jun 2009 11:37:17 +0000 (11:37 +0000)]
Provide a little more information in the logs when parameters are invalid. Speeds up the process of tracking down the broken request in the access log. Don't show the stack trace unless debug is enabled.

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

16 years agoUpdate commons pool to 1.5. Pool 1.5 fixes a number of concurrency bugs and introduce...
markt [Thu, 11 Jun 2009 08:50:00 +0000 (08:50 +0000)]
Update commons pool to 1.5. Pool 1.5 fixes a number of concurrency bugs and introduces fair allocation so the first thread to ask for an object from the pool is the first thread to get it.

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

16 years agoDBCP no longer requires commons-collections. Removed used lib from build.
markt [Thu, 11 Jun 2009 08:48:17 +0000 (08:48 +0000)]
DBCP no longer requires commons-collections. Removed used lib from build.

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

16 years agoAdd the executor to be part of the JMX output
fhanik [Wed, 10 Jun 2009 19:56:29 +0000 (19:56 +0000)]
Add the executor to be part of the JMX output

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

16 years agoRevert my previously not so clever implementation.
fhanik [Wed, 10 Jun 2009 19:40:31 +0000 (19:40 +0000)]
Revert my previously not so clever implementation.
If there is an executor being used, then one shall expect that the executor is reporting the numbers of threads itself, and it should no longer be the responsibility of the connector

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

16 years agoBetter fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47318
markt [Wed, 10 Jun 2009 12:31:29 +0000 (12:31 +0000)]
Better fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47318
Process include preludes and codas for top level JSP pages only

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

16 years agoRevert r782166 as it introduced a regression of its own.
markt [Wed, 10 Jun 2009 12:15:42 +0000 (12:15 +0000)]
Revert r782166 as it introduced a regression of its own.

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

16 years agoAs per kkolinko's comment - remove old comment
markt [Wed, 10 Jun 2009 11:53:14 +0000 (11:53 +0000)]
As per kkolinko's comment - remove old comment

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

16 years agoRestore correct mime-type for MS Word
markt [Wed, 10 Jun 2009 11:33:55 +0000 (11:33 +0000)]
Restore correct mime-type for MS Word

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

16 years agoPut a short timeout on the unlock accept
fhanik [Tue, 9 Jun 2009 22:28:00 +0000 (22:28 +0000)]
Put a short timeout on the unlock accept

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237
fhanik [Tue, 9 Jun 2009 22:14:55 +0000 (22:14 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47237
There is no need to associate the Http11NioProcessor with a socket in between requests unless there is a comet.

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

16 years agoTake into account that executors can be provided, standard and non standard thread...
fhanik [Tue, 9 Jun 2009 18:58:25 +0000 (18:58 +0000)]
Take into account that executors can be provided, standard and non standard thread pool executors through config or programmatically.
Hence we want to expose the correct values for curThread and curThreadBusy

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

16 years agoRevert http://svn.apache.org/viewvc?view=rev&revision=763566
fhanik [Tue, 9 Jun 2009 18:51:07 +0000 (18:51 +0000)]
Revert svn.apache.org/viewvc?view=rev&revision=763566
The code is not the same as it was before. The patch applied, while it looks the same will grow the pool the max threads even though it doesn't need to

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

16 years agoUse a more sensible default.
markt [Mon, 8 Jun 2009 21:29:27 +0000 (21:29 +0000)]
Use a more sensible default.
Patch suggested by Ian Darwin.

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

16 years agoRemove a deprecated method
markt [Mon, 8 Jun 2009 20:25:34 +0000 (20:25 +0000)]
Remove a deprecated method

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

16 years agoCreate for bash
fhanik [Mon, 8 Jun 2009 19:53:39 +0000 (19:53 +0000)]
Create for bash

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

16 years agologin -> authenticate
markt [Sat, 6 Jun 2009 12:54:28 +0000 (12:54 +0000)]
login -> authenticate

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

16 years agoAdd default
markt [Sat, 6 Jun 2009 12:50:53 +0000 (12:50 +0000)]
Add default

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

16 years agoUpdate types
markt [Sat, 6 Jun 2009 12:50:28 +0000 (12:50 +0000)]
Update types

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

16 years agoFix copy and paste error
markt [Sat, 6 Jun 2009 12:49:52 +0000 (12:49 +0000)]
Fix copy and paste error

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

16 years agoCosmetic changes
markt [Sat, 6 Jun 2009 12:49:12 +0000 (12:49 +0000)]
Cosmetic changes
 - make since tags consistent
 - Add TODOs were required
 - Fix copy and paste errors in javadoc

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47318
markt [Fri, 5 Jun 2009 23:35:14 +0000 (23:35 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47318
Process include preludes and codas when processing directives and whole pages.

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47299
markt [Fri, 5 Jun 2009 21:38:44 +0000 (21:38 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47299
Simplify fireContainerEvent method and enable it to work with implementations that extend StandardContext.
See http://svn.apache.org/viewvc?view=rev&revision=287710 for why it was written this way originally.

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

16 years agoDifferentiate between APR having been initialised and being available. Changes the...
markt [Fri, 5 Jun 2009 14:42:43 +0000 (14:42 +0000)]
Differentiate between APR having been initialised and being available. Changes the meaning of aprInitialized so will not propose for back port.

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

16 years agoFix the logic for the min version tests
markt [Fri, 5 Jun 2009 13:47:50 +0000 (13:47 +0000)]
Fix the logic for the min version tests

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

16 years agoAllow trunk to work with native trunk (1.2.x) and the 1.1.x branch.
markt [Fri, 5 Jun 2009 13:17:28 +0000 (13:17 +0000)]
Allow trunk to work with native trunk (1.2.x) and the 1.1.x branch.
Update recommended version to latest.
Note minor version number changes are meant to be binary compatible with previous versions.

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

16 years agoFix wording on version warning message
markt [Fri, 5 Jun 2009 13:11:42 +0000 (13:11 +0000)]
Fix wording on version warning message

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

16 years agoSimplify logging.
markt [Fri, 5 Jun 2009 13:04:27 +0000 (13:04 +0000)]
Simplify logging.

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

16 years agoDon't try an init APR in the connector. Let the listener do it. Prevents unexpected...
markt [Fri, 5 Jun 2009 12:45:13 +0000 (12:45 +0000)]
Don't try an init APR in the connector. Let the listener do it. Prevents unexpected enabling of APR just because the DLL is present.

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
markt [Thu, 4 Jun 2009 15:36:07 +0000 (15:36 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47158
Thread safety issues

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

16 years agoOrder mime-mappings alphabetically. Makes finding dups a lot easier.
markt [Wed, 3 Jun 2009 20:09:42 +0000 (20:09 +0000)]
Order mime-mappings alphabetically. Makes finding dups a lot easier.
Remove older of ms dups were present.

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

16 years agoConsolidate directory creation from doing it in multiple places with no indication...
fhanik [Tue, 2 Jun 2009 14:04:42 +0000 (14:04 +0000)]
Consolidate directory creation from doing it in multiple places with no indication of failure and only for xmlBase to create directories during the startup phase for both appBase and xmlBase

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

16 years agoUpdate to 2.0.5 tag and remove 64-bit GUI binaries
mturk [Fri, 29 May 2009 11:04:52 +0000 (11:04 +0000)]
Update to 2.0.5 tag and remove 64-bit GUI binaries

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

16 years agoFix bz41564 by adding /user option to service.bat which respawns the service.bat
mturk [Wed, 27 May 2009 08:19:13 +0000 (08:19 +0000)]
Fix bz41564 by adding /user option to service.bat which respawns the service.bat
using runas command. This pops-up a new window with elevated security on Vista+

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

16 years agoRemove a few lines of redundant code
markt [Tue, 26 May 2009 16:08:26 +0000 (16:08 +0000)]
Remove a few lines of redundant code

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

16 years agoFix case B in bug 43343. Don't try to swap out a session that is being accessed.
markt [Mon, 25 May 2009 22:32:57 +0000 (22:32 +0000)]
Fix case B in bug 43343. Don't try to swap out a session that is being accessed.

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

16 years agoStop access count going negative when session is swapped in. This fix is required...
markt [Mon, 25 May 2009 22:26:34 +0000 (22:26 +0000)]
Stop access count going negative when session is swapped in. This fix is required for the fix for bug 43343.

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

16 years agoReduce visibility of parseHost as discussed as a side issue to bug 47216.
markt [Mon, 25 May 2009 11:00:23 +0000 (11:00 +0000)]
Reduce visibility of parseHost as discussed as a side issue to bug 47216.

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47228
markt [Mon, 25 May 2009 10:26:22 +0000 (10:26 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47228
Correct French spellings.
Patch provided by Sebb. (Trusting that his French is a lot better than mine)

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

16 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=47235
markt [Mon, 25 May 2009 10:18:13 +0000 (10:18 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=47235
Remove use of auto-reconnect flag from MySQL examples

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