git.internetallee.de Git

kkolinko [Tue, 21 Jun 2011 10:17:17 +0000 (10:17 +0000)]

Align tomcat.util.scan.DefaultJarScanner.jarsToSkip value in TomcatBaseTest.
Add junit and ant-launcher to the value in catalina.properties

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 10:02:56 +0000 (10:02 +0000)]

Add @Override
Use buf.add(char) when there is a single character string

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 08:58:19 +0000 (08:58 +0000)]

Fix typos in committer ids

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 08:42:13 +0000 (08:42 +0000)]

Add comment on item ordering, update
one entry, add one entry.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 07:39:44 +0000 (07:39 +0000)]

Fix typo and more clarification about CATALINA_OPTS
vs. JAVA_OPTS.

Thanks to Rainer Frey.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 06:17:38 +0000 (06:17 +0000)]

Add an info about setenv.sh before listing the
customizable variables.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 06:13:44 +0000 (06:13 +0000)]

Clarify difference between CATALINA_OPTS and
JAVA_OPTS in the scripts.

Feel free to improve wording and examples.

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

commit | commitdiff | tree

rjung [Tue, 21 Jun 2011 05:30:55 +0000 (05:30 +0000)]

Define CATALINA_BASE fallback earlier,
so one can use CATALINA_BASE and CATALINA_HOME
variables in setenv without knowing, whether
the two have been split (i.e. CATALINA_BASE is
set) or not.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 23:09:49 +0000 (23:09 +0000)]

Auto format

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 23:02:10 +0000 (23:02 +0000)]

Deprecated TagPool that may trigger memory leaks.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 22:34:16 +0000 (22:34 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51396
Correctly handle jsp-file entries in web.xml when the JSP servlet has been configured via code when embedding Tomcat.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 22:28:57 +0000 (22:28 +0000)]

Ordering

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 20:20:27 +0000 (20:20 +0000)]

Fix odd looking code

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 20:12:26 +0000 (20:12 +0000)]

Make sure we never use the DateFormatCache with
millisecond patterns.

Tidy the format pattern like we do in the
AccessLogValve.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 19:47:57 +0000 (19:47 +0000)]

Let OneLineFormatter use DateFormatCache.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 19:44:04 +0000 (19:44 +0000)]

More Jars to skip: ant-junit and Java Help.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 19:26:45 +0000 (19:26 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51395
Fix memory leak triggered when an application that includes a SAXParserFactory is the first web application to be loaded.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 19:01:14 +0000 (19:01 +0000)]

Remove unused code.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 18:19:08 +0000 (18:19 +0000)]

Address kkolinko's review comments

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 18:02:25 +0000 (18:02 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=33453
Recompile JSPs if last modified time of the source or any of its dependencies changes either forwards or backwards. Note that this introduces an incompatible change to the code generated for JSPs. Tomcat will automatically re-compile any JSPs and tag files found in the work directory when upgrading from 7.0.16 or earlier to 7.0.17 or later. If you later downgrade from 7.0.17 or later to 7.0.16 or earlier, you must empty the work directory as part of the downgrade process.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 16:38:40 +0000 (16:38 +0000)]

The fix for bug 51310 caused a regression that re-introduced bug 49957 and deleted the contents of the work directory when Tomcat was shutdown. This fix ensures that that work directory for an application is not deleted when Tomcat is shutdown.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 15:11:59 +0000 (15:11 +0000)]

Add note about script changes.

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 14:57:37 +0000 (14:57 +0000)]

Packages tag files have jndi URLs not file URLs

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

commit | commitdiff | tree

markt [Mon, 20 Jun 2011 14:24:19 +0000 (14:24 +0000)]

Remove unnecessary code.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 12:37:57 +0000 (12:37 +0000)]

Add configtest to Windows catalina.bat.

Not yet complete:

- No error code escalation
- No log message

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 12:37:01 +0000 (12:37 +0000)]

Slight improvement of configtest handling in
Unix shell script:

- add to usage
- don't use CATALINA_OPTS (think memory size etc.)
- log a message if status != 0

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:53:37 +0000 (09:53 +0000)]

Make variable explanations for catalina.bat
and tool-wrapper.bat consistent with their Unix
counterparts.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:52:45 +0000 (09:52 +0000)]

Make tool-wrapper.sh consistent with catalina.sh.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:52:16 +0000 (09:52 +0000)]

- Clarify JRE_HOME in catalina.sh
- sort OS detection by OS name

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:50:17 +0000 (09:50 +0000)]

Make JRE / JDK detection on Windows work
the same way as on Unix:
- if "debug" is demanded, only use JAVA_HOME
and check for a JDK there
- without "debug", either use JRE_HOME
or JAVA_HOME with precedence on JRE_HOME

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:27:44 +0000 (09:27 +0000)]

Add missing Windows configtest script.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:27:30 +0000 (09:27 +0000)]

Make Windows shell scripts for individual
commands consistent.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 09:26:36 +0000 (09:26 +0000)]

Make Unix shell scripts for individual
commands consistent.

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

commit | commitdiff | tree

rjung [Mon, 20 Jun 2011 08:06:56 +0000 (08:06 +0000)]

Add the Tomcat extras JARs to the list of JARs
to skip when scanning for TLDs and web fragments.

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:39:58 +0000 (21:39 +0000)]

Method is identical to method in superclass so remove it

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:33:55 +0000 (21:33 +0000)]

Pull up prepareRequest()

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:27:38 +0000 (21:27 +0000)]

Align with BIO (add debug log messages)
Prepare for pulling up (add tests around adverts for comet support)

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:23:14 +0000 (21:23 +0000)]

Add flags that indicate optional feature support

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 21:15:22 +0000 (21:15 +0000)]

Reset sendfile data in recycle method so prepareRequest can be pulled up

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 19:21:34 +0000 (19:21 +0000)]

Extend margin lese tests fail on Linux VM

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 17:28:26 +0000 (17:28 +0000)]

Add an additional error margin to avoid false test failures

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 17:08:59 +0000 (17:08 +0000)]

Add missing sync that triggered test failures on Linux VM post re-factoring

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 17:08:11 +0000 (17:08 +0000)]

Align with JIoEndpoint

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 16:30:26 +0000 (16:30 +0000)]

Pull up getBody message

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 15:56:22 +0000 (15:56 +0000)]

Pull up common code

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 15:50:17 +0000 (15:50 +0000)]

Pull up more common code in Processor constructors

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 15:00:40 +0000 (15:00 +0000)]

Pull up common endpoint code in Processor constructors

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 14:27:52 +0000 (14:27 +0000)]

No need to for addToPoller in APR HTTP.

When returning SocketState.OPEN the socket is
always added to the poller.

Fixes some crashes due to putting the same socket
twice in the poller.

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 11:22:20 +0000 (11:22 +0000)]

Add new timestamp formatting info to AccessLogValve
docs.

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 10:58:02 +0000 (10:58 +0000)]

BZ 49165 and more:
- Allow any time stamp formats supported
by SimpleDateFormat in AccessLogValve.
- Support logging begin and/or end of request.

Docs to follow.

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 10:53:00 +0000 (10:53 +0000)]

Start to pull up common code from constructors

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 10:07:22 +0000 (10:07 +0000)]

Pull up definition of standard messages

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 09:50:17 +0000 (09:50 +0000)]

More refactoring since last release

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

commit | commitdiff | tree

rjung [Sun, 19 Jun 2011 09:47:32 +0000 (09:47 +0000)]

Use static final instead of volatile in
AccessLogValve.

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

commit | commitdiff | tree

markt [Sun, 19 Jun 2011 09:46:36 +0000 (09:46 +0000)]

Don't use println to write output since os differences will result in different numbers of bytes output

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

commit | commitdiff | tree

markt [Sat, 18 Jun 2011 13:41:17 +0000 (13:41 +0000)]

Connector re-factoring
Align APR with BIO/NIO

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

commit | commitdiff | tree

markt [Sat, 18 Jun 2011 13:03:50 +0000 (13:03 +0000)]

Connector re-factoring
Start to align APR with BIO/NIO

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

commit | commitdiff | tree

markt [Sat, 18 Jun 2011 11:49:14 +0000 (11:49 +0000)]

Gump is failing. Re-order tests to try and figure out why.

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 22:46:12 +0000 (22:46 +0000)]

Speed up test

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 22:37:53 +0000 (22:37 +0000)]

Connector re-factoring
Broadly align NIO Handler.process with BIO Handler.process
Remove event() method from NIO handler

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 22:16:26 +0000 (22:16 +0000)]

Connector re-factoring
Remove the need to track isAsync in the SocketWrapper

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 22:03:10 +0000 (22:03 +0000)]

SocketState.ASYNC_END should no longer reach BIO endpoint

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 22:01:35 +0000 (22:01 +0000)]

Connector re-factoring
Align Ajp impl with Http impl for BIO

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 21:56:58 +0000 (21:56 +0000)]

Connector re-factoring
First step towards removing SocketState.ASYNC_END from the endpoint
Also a few percent faster, at least running the Async unit tests

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 21:41:32 +0000 (21:41 +0000)]

Connector refactoring
No functional change

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 21:35:59 +0000 (21:35 +0000)]

Connector refactoring
No functional change

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 16:17:21 +0000 (16:17 +0000)]

Connector re-factoring
No functional change

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 14:56:05 +0000 (14:56 +0000)]

Ignore Eclipse files

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 13:03:30 +0000 (13:03 +0000)]

Add a simple Comet test case

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 12:12:46 +0000 (12:12 +0000)]

Remove empty dir

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 12:11:16 +0000 (12:11 +0000)]

Remove empty dir

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 08:54:28 +0000 (08:54 +0000)]

Aligning code between connectors
Remove extra method from JIoEndpoint.Handler

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

commit | commitdiff | tree

markt [Fri, 17 Jun 2011 08:33:23 +0000 (08:33 +0000)]

Add missing transition

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

commit | commitdiff | tree

markt [Thu, 16 Jun 2011 17:26:15 +0000 (17:26 +0000)]

Tomorrow is the 17th

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

commit | commitdiff | tree

markt [Thu, 16 Jun 2011 17:25:50 +0000 (17:25 +0000)]

Release tomorrow. Mirrors should have sync'd by then.

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

commit | commitdiff | tree

markt [Thu, 16 Jun 2011 17:24:03 +0000 (17:24 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51386
Correct code for processing @HandlesTypes annotations so only types of interest are reported to a ServletContainerInitializer.

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

commit | commitdiff | tree

markt [Thu, 16 Jun 2011 12:28:01 +0000 (12:28 +0000)]

Align SSI regexp handling with htttpd

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

commit | commitdiff | tree

kkolinko [Thu, 16 Jun 2011 08:18:44 +0000 (08:18 +0000)]

Add session="false" directive to the index page of the ROOT web application.
There is no need to create a session when accessing this page.

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 22:44:00 +0000 (22:44 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=48956
Implement regular expression support for SSI

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 21:58:00 +0000 (21:58 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=43538
Add host name and IP address to the HTML Manager application.
Patch by Dennis Lundberg.

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 20:32:14 +0000 (20:32 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51376
Complete fix. Ensure Servlet.destroy() is only called if Servlet.init() was called.

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 16:24:42 +0000 (16:24 +0000)]

Pull up asyncDispatch()

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 16:19:06 +0000 (16:19 +0000)]

Align code between connectors in preparation for pulling code up to the superclass
No need to close the AJP connection if there was no error

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 15:56:59 +0000 (15:56 +0000)]

Align code between connectors in preparation for pulling code up to the superclass
When returning SocketState.CLOSED, recycle is always called

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 15:46:54 +0000 (15:46 +0000)]

Align code between connectors in preparation for pulling code up to the superclass

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 15:43:53 +0000 (15:43 +0000)]

Align code between connectors in preparation for pulling code up to the superclass
No need to pass the socket into the asyncDispatch() call. It will always have been set beforehand.

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

commit | commitdiff | tree

kkolinko [Wed, 15 Jun 2011 14:48:11 +0000 (14:48 +0000)]

Add to the logging.properties file a sample configuration setting
for enabling debug messages in TldLocationsCache.
Slightly improve the messages printed by TldLocationsCache.

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

commit | commitdiff | tree

kkolinko [Wed, 15 Jun 2011 14:32:08 +0000 (14:32 +0000)]

Add sunmscapi.jar to jarsToSkip
I found it in version 6u25 of Oracle JDK and JRE on Windows 32-bit.

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

commit | commitdiff | tree

kkolinko [Wed, 15 Jun 2011 13:51:03 +0000 (13:51 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50677
Allow ANT style variables in the common.loader and other *.loader properties in conf/catalina.properties

I do not implement the substitution for any property as suggested by BZ 50677,
but only for the class loader ones. I think this is sufficient for the use case
and does not break backwards compatibility.
Most of the code is copied from ClassLoaderLogManager.replace().

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 13:21:16 +0000 (13:21 +0000)]

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

commit | commitdiff | tree

markt [Wed, 15 Jun 2011 12:55:24 +0000 (12:55 +0000)]

Fix typo reported by @earthgecko

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

commit | commitdiff | tree

rjung [Mon, 13 Jun 2011 18:14:46 +0000 (18:14 +0000)]

Fix crash observed during pausing the connector when using APR.

Only add socket to poller if we are sure we don't close it later.

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

commit | commitdiff | tree

rjung [Mon, 13 Jun 2011 14:40:18 +0000 (14:40 +0000)]

Fix copy&paste error in comment.

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

commit | commitdiff | tree

rjung [Mon, 13 Jun 2011 11:19:23 +0000 (11:19 +0000)]

Remove superfluous quotes from thread names for
connection pools.

Example broken thread name: "http-apr-8001"-exec-2
(including leading and intermediate quotes).

Since we never use the names as a full ObjectName,
only as a part of an ObjectName, it is safe to
remove the surrounding quotes from the Protocol name.

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

commit | commitdiff | tree

kfujino [Mon, 13 Jun 2011 09:57:27 +0000 (09:57 +0000)]

correct changelog.

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

commit | commitdiff | tree

kfujino [Mon, 13 Jun 2011 09:44:33 +0000 (09:44 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51306.
Avoid NPE when handleSESSION_EXPIRED is processed while handleSESSION_CREATED is being processed.

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

commit | commitdiff | tree

markt [Sun, 12 Jun 2011 19:28:17 +0000 (19:28 +0000)]

Update the Maven repo info

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

commit | commitdiff | tree

rjung [Sun, 12 Jun 2011 15:47:53 +0000 (15:47 +0000)]

Fix unit test for bindOnInit.

Test failed when Java was binding sockets using
IPv4 and APR using IPv6. Since the connector
uses APR, and the test socket Java, both could bind
at the same time.

Observed on Solaris 10 Sparc.

Fixed by also uding APR to bind the test socket.

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

commit | commitdiff | tree

markt [Sat, 11 Jun 2011 10:31:58 +0000 (10:31 +0000)]

Update ready for next release

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

commit | commitdiff | tree

kkolinko [Fri, 10 Jun 2011 08:15:16 +0000 (08:15 +0000)]

Add bug number for r1134048

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

Unnamed repository; edit this file to name it for gitweb.

RSS Atom