tomcat7.0
17 years agoFix 45509 - typos
markt [Wed, 30 Jul 2008 22:37:11 +0000 (22:37 +0000)]
Fix 45509 - typos

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

17 years agoPort http://svn.apache.org/viewvc?rev=678137&view=rev (additional normalization check...
markt [Tue, 29 Jul 2008 16:28:59 +0000 (16:28 +0000)]
Port svn.apache.org/viewvc?rev=678137&view=rev (additional normalization check) to trunk

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45453
markt [Tue, 29 Jul 2008 14:58:05 +0000 (14:58 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45453
Add yet more synchronisation to JDBCRealm.
Based on a patch provided by Santtu Hyrkk.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45459
markt [Tue, 29 Jul 2008 14:29:27 +0000 (14:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45459
Provide info on possible cause of exception.

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

17 years agoFix error in JAAS realm doc reported on users list.
markt [Sun, 27 Jul 2008 13:20:07 +0000 (13:20 +0000)]
Fix error in JAAS realm doc reported on users list.

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

17 years agoThis was discussed a month ago - didn't hear any objections. It uses the 'platform...
costin [Fri, 18 Jul 2008 14:11:03 +0000 (14:11 +0000)]
This was discussed a month ago - didn't hear any objections. It uses the 'platform' mbean server instead of a new one if none
was explicitely created. This allows using jconsole without any flags - without the change it would only show platform mbeans,
now it has tomcat mbeans as well.

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

17 years agoGrammar + typos: Fix PR#45422
jfclere [Fri, 18 Jul 2008 06:39:45 +0000 (06:39 +0000)]
Grammar + typos: Fix PR#45422

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

17 years agoRemove pre-loading of inner class that was removed as part of r605000.
markt [Thu, 17 Jul 2008 23:12:03 +0000 (23:12 +0000)]
Remove pre-loading of inner class that was removed as part of r605000.

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

17 years agoFix bug 42727. Handle request lines that are exact multiples of 4096 in length.
markt [Thu, 17 Jul 2008 22:09:18 +0000 (22:09 +0000)]
Fix bug 42727. Handle request lines that are exact multiples of 4096 in length.
Patch provided by Will Pugh.

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

17 years agoAdd a non-config starter for tomcat. All you need is the classpath including tomcat...
costin [Thu, 17 Jul 2008 17:14:47 +0000 (17:14 +0000)]
Add a non-config starter for tomcat. All you need is the classpath including tomcat and the servlets - no config file.
There is a requirement for a temp directory - the spec requires that webapps are provided with one I believe.
It is possible to remove this or do it lazily or have some default in /tmp, if anyone wants to.

Also adding a context requires some base dir ( can be an empty one ) - so the default servlets points to something.
This can also be eliminated by setting a different default servlet - needs to be done if wanted.

It is also pretty fast - the unit tests show startup + first request in ~1 sec.

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

17 years agofirst chunk - make sure END gets called properly, if the event was closed
fhanik [Thu, 17 Jul 2008 00:13:37 +0000 (00:13 +0000)]
first chunk - make sure END gets called properly, if the event was closed
second chunk - if the POST body is x-www-form-urlencoded, request.getAvailable() returns 0 for IdentityInputFilter
so we still need to invoke READ event if there is a body, and it hasn't been processes by the servlet

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

17 years agoAs Remy pointed out, this really should be in the finally block.
markt [Tue, 15 Jul 2008 15:51:44 +0000 (15:51 +0000)]
As Remy pointed out, this really should be in the finally block.

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

17 years agoRevert changes as root cause of issue appears to be strangeness in my build environment.
markt [Tue, 15 Jul 2008 09:14:21 +0000 (09:14 +0000)]
Revert changes as root cause of issue appears to be strangeness in my build environment.

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

17 years agoUse tomcat native from ASF repository instead downloading at install time from tomcat...
mturk [Mon, 14 Jul 2008 08:36:41 +0000 (08:36 +0000)]
Use tomcat native from ASF repository instead downloading at install time from tomcat.heanet.ie

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

17 years agoPrevious patch didn't go far enough. No need to pre-load StandardWrapper.
markt [Sun, 13 Jul 2008 18:30:19 +0000 (18:30 +0000)]
Previous patch didn't go far enough. No need to pre-load StandardWrapper.

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

17 years agoStartup fails with security enabled
markt [Thu, 10 Jul 2008 23:00:31 +0000 (23:00 +0000)]
Startup fails with security enabled

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
markt [Thu, 10 Jul 2008 21:11:16 +0000 (21:11 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42722
Possible NPE in CGIServlet.java
Patch provided by Nils Hammar

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

17 years agoAuto-generated changes as a result of http://svn.apache.org/viewvc?rev=675726&view=rev
markt [Thu, 10 Jul 2008 21:05:35 +0000 (21:05 +0000)]
Auto-generated changes as a result of svn.apache.org/viewvc?rev=675726&view=rev

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42565
markt [Thu, 10 Jul 2008 20:53:24 +0000 (20:53 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42565
el ternary expression without space before colon now works
Patch provided by Lucas Galfaso
This is just the jjt patch. The resulting changes to the generated code will follow.

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

17 years agoGo back to the original patch. The better one didn't pan out. Sorry for the noise.
markt [Thu, 10 Jul 2008 18:34:22 +0000 (18:34 +0000)]
Go back to the original patch. The better one didn't pan out. Sorry for the noise.

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

17 years agoRevert previous patch prior to applying a better one
markt [Thu, 10 Jul 2008 18:20:18 +0000 (18:20 +0000)]
Revert previous patch prior to applying a better one

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
markt [Thu, 10 Jul 2008 17:01:23 +0000 (17:01 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42678
Only ignore docBase it it really is a subdir of appBase
Patch provided by juergen

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285
markt [Wed, 9 Jul 2008 20:50:18 +0000 (20:50 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45285
Should look for annotations all the way up the class hierarchy

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

17 years agoFix bug 45323. Add note that context.xml files can only contain a single Context.
markt [Sun, 6 Jul 2008 20:02:06 +0000 (20:02 +0000)]
Fix bug 45323. Add note that context.xml files can only contain a single Context.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332
markt [Sun, 6 Jul 2008 19:31:20 +0000 (19:31 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45332
Specify the correct encoding (the current windows code page) rather than assuming UTF-8 when creating tomcat-users.xml

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

17 years agoPort windows installer changes from 6.0.x to trunk
markt [Sun, 6 Jul 2008 16:14:01 +0000 (16:14 +0000)]
Port windows installer changes from 6.0.x to trunk

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

17 years agoAdd in startup options to the cluster channel.
fhanik [Fri, 4 Jul 2008 21:30:31 +0000 (21:30 +0000)]
Add in startup options to the cluster channel.
Document the multicast recovery options

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

17 years agoFix 45310, 45308 and a couple of additional typos. Also use OpenSSL consistently...
markt [Fri, 4 Jul 2008 07:52:17 +0000 (07:52 +0000)]
Fix 45310, 45308 and a couple of additional typos. Also use OpenSSL consistently and fix a very long line.

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

17 years agoExtract the query string before we try to normalise the URI
markt [Thu, 3 Jul 2008 21:26:13 +0000 (21:26 +0000)]
Extract the query string before we try to normalise the URI

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

17 years agoMake filtering of /r and /n in headers consistent for all connectors.
markt [Thu, 3 Jul 2008 20:52:42 +0000 (20:52 +0000)]
Make filtering of /r and /n in headers consistent for all connectors.
Make handling of 404s consistent across components.
Provide option to include custom status message in headers. SRV.5.3 suggests custom messages are intended for the body of the response, not the status line.

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

17 years agoFix for bug 45317, document and properly output the session timeout time
fhanik [Wed, 2 Jul 2008 20:41:10 +0000 (20:41 +0000)]
Fix for bug 45317, document and properly output the session timeout time

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

17 years agotypo: 45309
jfclere [Wed, 2 Jul 2008 08:44:37 +0000 (08:44 +0000)]
typo: 45309

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

17 years agoAdd some extra info on keystore type.
jfclere [Tue, 1 Jul 2008 11:34:06 +0000 (11:34 +0000)]
Add some extra info on keystore type.

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

17 years agoport fix for BZ 36155 from the JK Connector
billbarker [Sat, 28 Jun 2008 02:11:48 +0000 (02:11 +0000)]
port fix for BZ 36155 from the JK Connector

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45277
markt [Fri, 27 Jun 2008 21:48:41 +0000 (21:48 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45277
Correct typo

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

17 years agoFix for part 3 of https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
markt [Fri, 27 Jun 2008 21:39:27 +0000 (21:39 +0000)]
Fix for part 3 of https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
This isn't perfect but it narrows the window for the race condition significantly. A perfect fix would require syncing most (all?) of allocate() which is on the critical path.

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

17 years agodoco update for fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45272
fhanik [Thu, 26 Jun 2008 18:25:30 +0000 (18:25 +0000)]
doco update for fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=45272

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

17 years agowork around for IE not being RFC compliant, IE doesn't like quotes around the path...
fhanik [Thu, 26 Jun 2008 18:24:18 +0000 (18:24 +0000)]
work around for IE not being RFC compliant, IE doesn't like quotes around the path value, even though a slash is considered a header delimiter and must be quoted, fix for bug https://issues.apache.org/bugzilla/show_bug.cgi?id=45272

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

17 years agoupdate changelog
fhanik [Wed, 25 Jun 2008 20:46:02 +0000 (20:46 +0000)]
update changelog

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

17 years agofix for bug 45279, close multicast socket on close
fhanik [Wed, 25 Jun 2008 20:44:48 +0000 (20:44 +0000)]
fix for bug 45279, close multicast socket on close

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

17 years agoProvide an option to disable the fix for 45015 that raised an error if attributes...
markt [Fri, 20 Jun 2008 21:34:09 +0000 (21:34 +0000)]
Provide an option to disable the fix for 45015 that raised an error if attributes were not correctly quoted.

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

17 years agoUse localhost instead of 127.0.0.1
jfclere [Wed, 18 Jun 2008 09:08:14 +0000 (09:08 +0000)]
Use localhost instead of 127.0.0.1

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

17 years agoAdditional check related to bug 45195.
markt [Tue, 17 Jun 2008 22:13:00 +0000 (22:13 +0000)]
Additional check related to bug 45195.

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

17 years agoApply Filip's better patch for https://issues.apache.org/bugzilla/show_bug.cgi?id...
markt [Tue, 17 Jun 2008 22:04:50 +0000 (22:04 +0000)]
Apply Filip's better patch for https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
Map.entrySet() should return entries, not values

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

17 years agoRevert previous fix after veto.
markt [Tue, 17 Jun 2008 22:01:01 +0000 (22:01 +0000)]
Revert previous fix after veto.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
markt [Mon, 16 Jun 2008 17:22:36 +0000 (17:22 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45212
Map.entrySet() should return entries, not values

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

17 years agoAnother fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
markt [Fri, 13 Jun 2008 20:40:27 +0000 (20:40 +0000)]
Another fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
There was a short period where the context didn't appear in the mapper that resulted in some more 404s.

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

17 years agoFix bug 45195. NPE when calling getAttribute(null).
markt [Fri, 13 Jun 2008 17:43:51 +0000 (17:43 +0000)]
Fix bug 45195. NPE when calling getAttribute(null).
The spec is unclear but this is a regression from 5.0.x

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

17 years agoupdate changelog
fhanik [Tue, 10 Jun 2008 17:44:24 +0000 (17:44 +0000)]
update changelog

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

17 years agoprevent NPE during shutdown where the logger has been shutdown and delayed resources...
fhanik [Tue, 10 Jun 2008 17:43:28 +0000 (17:43 +0000)]
prevent NPE during shutdown where the logger has been shutdown and delayed resources still trying to log
java.lang.NullPointerException
at org.apache.juli.FileHandler.publish(FileHandler.java:136)

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

17 years agoMake forced coercion of null and "" to zero optional. It is enabled by default, as...
markt [Mon, 9 Jun 2008 16:41:58 +0000 (16:41 +0000)]
Make forced coercion of null and "" to zero optional. It is enabled by default, as per the spec.
Patch by Nils Eckert.

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

17 years agoAdd an additional layer of protection in case app fails to protect against an XSS.
markt [Sun, 8 Jun 2008 11:30:44 +0000 (11:30 +0000)]
Add an additional layer of protection in case app fails to protect against an XSS.
Copied filter code to jasper module so no new dependency is created.

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

17 years agoAdd a new valve that works-around the broken MS WedDAV client.
markt [Sat, 7 Jun 2008 14:34:36 +0000 (14:34 +0000)]
Add a new valve that works-around the broken MS WedDAV client.

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

17 years agoFix potential XSS in host-manager.
markt [Mon, 2 Jun 2008 21:41:28 +0000 (21:41 +0000)]
Fix potential XSS in host-manager.
This is CVE-2008-1947.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45101
markt [Thu, 29 May 2008 21:32:02 +0000 (21:32 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45101
Format dates for header value from DirContextURLConnection using HTTP format.
Patch provided by Chris Hubick.

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

17 years agoAdditional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
markt [Wed, 28 May 2008 20:42:22 +0000 (20:42 +0000)]
Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=43683
If the context is reloaded, the classloader will have changed so need to reset it

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

17 years agoRevert changes for 42747 whilst I work on a better fix.
markt [Thu, 22 May 2008 19:17:38 +0000 (19:17 +0000)]
Revert changes for 42747 whilst I work on a better fix.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747.
markt [Mon, 19 May 2008 21:47:19 +0000 (21:47 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42747.
Actually fixes a number of related bugs:
 - For a new WAR, use META-INF/context.xml for first initiation rather than copying it then using it on next start
 - For a new dir, use META-INF/context.xml for first initiation
 - For a new dir, copy any META-INF/context.xml to $CATALINA_BASE/[engine]/[host]/contextPath.xml

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

17 years agoNote: This patch is on the critical path.
markt [Mon, 19 May 2008 20:07:20 +0000 (20:07 +0000)]
Note: This patch is on the critical path.
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42750
Making parsing of the request line tolerant of multiple SP and/or HT rather than requiring single SP characters.

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

17 years agoAdditional patch from https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
markt [Sat, 17 May 2008 19:55:55 +0000 (19:55 +0000)]
Additional patch from https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
Make SSL providers configurable.
Based on a patch by Bruno Harbulot.

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

17 years agoCode clean-up. No functional change.
markt [Sat, 17 May 2008 19:39:14 +0000 (19:39 +0000)]
Code clean-up. No functional change.

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

17 years agoFix some Eclipse warnings in the examples webapp.
markt [Sat, 17 May 2008 18:52:23 +0000 (18:52 +0000)]
Fix some Eclipse warnings in the examples webapp.

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

17 years agoFix as many Eclipse warnings as I can in the unit tests.
markt [Sat, 17 May 2008 18:41:07 +0000 (18:41 +0000)]
Fix as many Eclipse warnings as I can in the unit tests.
Add some missing svn properties

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=44994
markt [Sat, 17 May 2008 17:33:43 +0000 (17:33 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44994
Correct BNF grammar so  ${0 lt a ? 1 lt a ? "many": "one": "none"} does not throw an exception
The patch is bigger than I would like due to the code generation tools used

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=45015
markt [Fri, 16 May 2008 22:28:09 +0000 (22:28 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=45015
You can't use an unescaped quote in an attribute value if you have quoted the value using that quote character

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

17 years agoFix NPE reported on the dev list. The other toUpperCase() calls should be safe since...
markt [Fri, 16 May 2008 17:46:34 +0000 (17:46 +0000)]
Fix NPE reported on the dev list. The other toUpperCase() calls should be safe since the String will be non-null when the method is called.

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

17 years agoImproved fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44968 as a single...
markt [Thu, 15 May 2008 17:07:31 +0000 (17:07 +0000)]
Improved fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44968 as a single patch
Provide more information when keystore load fails

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

17 years agoRevert previous 3 commits to create clean patch for 6.0.x
markt [Thu, 15 May 2008 17:01:47 +0000 (17:01 +0000)]
Revert previous 3 commits to create clean patch for 6.0.x

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

17 years agoupdate docs
fhanik [Thu, 15 May 2008 17:01:07 +0000 (17:01 +0000)]
update docs

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

17 years agofix broken build
fhanik [Thu, 15 May 2008 02:53:51 +0000 (02:53 +0000)]
fix broken build

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

17 years agoImprove logging messages associated with previous commit in response to Filip's veto
markt [Wed, 14 May 2008 07:17:46 +0000 (07:17 +0000)]
Improve logging messages associated with previous commit in response to Filip's veto

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

17 years agotab police
fhanik [Wed, 14 May 2008 02:29:56 +0000 (02:29 +0000)]
tab police

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

17 years agosave a few cpu cycles to avoid exceptions being thrown when a key is invalid
fhanik [Wed, 14 May 2008 01:58:27 +0000 (01:58 +0000)]
save a few cpu cycles to avoid exceptions being thrown when a key is invalid

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=44968
markt [Tue, 13 May 2008 22:32:17 +0000 (22:32 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44968
Provide more information when keystore load fails

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=44986
markt [Tue, 13 May 2008 21:40:59 +0000 (21:40 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44986
Convert to upper case before comparing encoding names

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

17 years agoCode clean-up. Remove unused code, parameters, etc.
markt [Tue, 13 May 2008 21:19:07 +0000 (21:19 +0000)]
Code clean-up. Remove unused code, parameters, etc.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=44988
markt [Tue, 13 May 2008 20:13:22 +0000 (20:13 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44988
Use Java 5 syntax to start debugger.
Patch provided by Cédrik Lime.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42934
markt [Fri, 9 May 2008 20:21:20 +0000 (20:21 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42934
Trigger contextInitialized() before sessionDidActivate()
TCK tests all pass but I want to give this a little longer in trunk before proposing it for 6.0.x

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=42943
markt [Thu, 8 May 2008 21:53:35 +0000 (21:53 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=42943
Make sure the nested element is inside a <jsp:text> element

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=44955
markt [Thu, 8 May 2008 21:32:46 +0000 (21:32 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44955
Use correct location for endorsed dir.

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

17 years agoClean-up. Remove old stuff that has just been commented out rather than deleted.
markt [Thu, 8 May 2008 21:30:36 +0000 (21:30 +0000)]
Clean-up. Remove old stuff that has just been commented out rather than deleted.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
markt [Wed, 7 May 2008 17:20:41 +0000 (17:20 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=44943
Reduce copy/paste issues caused by different engine names.

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

17 years agoCode clean-up. Remove unused method.
markt [Tue, 6 May 2008 17:52:29 +0000 (17:52 +0000)]
Code clean-up. Remove unused method.

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

17 years agoCode clean up - remove unnecessary casts.
markt [Tue, 6 May 2008 17:51:01 +0000 (17:51 +0000)]
Code clean up - remove unnecessary casts.

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

17 years agoFix bugs https://issues.apache.org/bugzilla/show_bug.cgi?id=43013 and https://issues...
markt [Mon, 5 May 2008 18:18:00 +0000 (18:18 +0000)]
Fix bugs https://issues.apache.org/bugzilla/show_bug.cgi?id=43013 and https://issues.apache.org/bugzilla/show_bug.cgi?id=44021
Add support to manger and deployer for wars and dirs that use # to denote multi-level contexts.

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

17 years agoFix various Eclipse warnings. Generics, unused code, etc
markt [Mon, 5 May 2008 16:08:07 +0000 (16:08 +0000)]
Fix various Eclipse warnings. Generics, unused code, etc
No functional change.

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

17 years agoFix typo in recently added dbcp check so you can build a release on a 1.5 JDK
markt [Sun, 4 May 2008 16:32:23 +0000 (16:32 +0000)]
Fix typo in recently added dbcp check so you can build a release on a 1.5 JDK

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

17 years agoNot sure if I got the process right - the 2 classes I want to submit can be found...
costin [Sun, 4 May 2008 15:49:05 +0000 (15:49 +0000)]
Not sure if I got the process right - the 2 classes I want to submit can be found on apache.org/~costin.
I don't think there is anything tricky about them - except the fact that it adds another option for
tomcat startup.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=43080 and https://issues.apach...
markt [Sun, 4 May 2008 10:41:48 +0000 (10:41 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43080 and https://issues.apache.org/bugzilla/show_bug.cgi?id=43079
Move warning to StandardContext so a) we can check all url-patterns and b) we associate the message with the context.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
markt [Sat, 3 May 2008 20:22:57 +0000 (20:22 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43094
Support any keystoreType that doesn't need a file.

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

17 years agoFix bug 43117. Setting an empty workDir can delete all of CATALINA_HOME.
markt [Sat, 3 May 2008 19:49:57 +0000 (19:49 +0000)]
Fix bug 43117. Setting an empty workDir can delete all of CATALINA_HOME.
Patch provided by Takayuki Kaneko.

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

17 years agoA final bit of code clean up.
markt [Sat, 3 May 2008 19:47:13 +0000 (19:47 +0000)]
A final bit of code clean up.
Actually no functional change.

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

17 years agoFix various Eclipse warnings. Generics, unused code, etc
markt [Sat, 3 May 2008 19:44:24 +0000 (19:44 +0000)]
Fix various Eclipse warnings. Generics, unused code, etc
No functional change.

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

17 years agoAdd Remy's NPE fix to trunk.
markt [Sat, 3 May 2008 10:28:51 +0000 (10:28 +0000)]
Add Remy's NPE fix to trunk.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
markt [Sat, 3 May 2008 10:14:00 +0000 (10:14 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43191
No way to turn off compression for some file types.
Based on a patch by Len Popp

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

17 years agoCode clean up. Remove unused methods, unnecessary casts/code, fix generics warnings...
markt [Fri, 2 May 2008 21:25:56 +0000 (21:25 +0000)]
Code clean up. Remove unused methods, unnecessary casts/code, fix generics warnings etc reported by Eclipse.
No functional change.

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

17 years agoSince not beeing able to build with JDK1.6 is so annoying - and commons-dbcp doesn...
costin [Fri, 2 May 2008 03:20:37 +0000 (03:20 +0000)]
Since not beeing able to build with JDK1.6 is so annoying - and commons-dbcp doesn't support jdk1.6 in the first place:
- let the compile work with jdk1.6, minus dbcp
- add a small warning at the end.

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

17 years agoMatch build.xml - exclude webservices, missing deps
costin [Fri, 2 May 2008 03:18:26 +0000 (03:18 +0000)]
Match build.xml - exclude webservices, missing deps
Not sure why it's checked in - if 'download' doesn't get the deps and build.xml doesn't build it.

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=43150
markt [Thu, 1 May 2008 21:25:01 +0000 (21:25 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43150
# in installation path stops Tomcat starting

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

17 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=43333
markt [Thu, 1 May 2008 21:20:45 +0000 (21:20 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43333
Correct sendfile docs.

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