git.internetallee.de Git

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

commit | commitdiff | tree

markt [Thu, 9 Jun 2011 20:10:23 +0000 (20:10 +0000)]

Document the state transition diagram

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

commit | commitdiff | tree

markt [Thu, 9 Jun 2011 20:06:46 +0000 (20:06 +0000)]

Fix Javadoc error

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

commit | commitdiff | tree

markt [Thu, 9 Jun 2011 19:15:40 +0000 (19:15 +0000)]

Prevent possible NPE when processing WebDAV locks.

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

commit | commitdiff | tree

markt [Thu, 9 Jun 2011 19:04:37 +0000 (19:04 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51344
Fix problem with Lifecycle re-factoring for deprecated embedded class that prevented events being triggered.

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

commit | commitdiff | tree

kkolinko [Thu, 9 Jun 2011 13:20:09 +0000 (13:20 +0000)]

https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
Reimplement system properties replacement code in ClassLoaderLogManager of JULI
1. Do not use recursion.
2. Do not stop on the first unrecognized property, but continue with the rest of the string.
3. Do not call System.getProperty() on an empty key, because it throws IllegalArgumentException. Threat "${}" as unrecognized property.

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

commit | commitdiff | tree

kkolinko [Thu, 9 Jun 2011 12:26:10 +0000 (12:26 +0000)]

Followup to r1133816
Remove properties that TortoiseSVN added to the new subdirectory.
It propagates those from the parent directory.

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

commit | commitdiff | tree

kkolinko [Thu, 9 Jun 2011 12:03:25 +0000 (12:03 +0000)]

Tests for ClassLoaderLogManager#replace()

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

commit | commitdiff | tree

kkolinko [Thu, 9 Jun 2011 07:55:43 +0000 (07:55 +0000)]

typos

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

commit | commitdiff | tree

markt [Wed, 8 Jun 2011 22:20:22 +0000 (22:20 +0000)]

Refactoring triggered security exception when running TCKs

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

commit | commitdiff | tree

markt [Wed, 8 Jun 2011 15:52:26 +0000 (15:52 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51340
Fix thread-safety issue when parsing multiple web.xml files in parallel. Apache Tomcat does not do this but products that embed it may.

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

commit | commitdiff | tree

markt [Wed, 8 Jun 2011 13:52:50 +0000 (13:52 +0000)]

Avoid possible NPE

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

commit | commitdiff | tree

kfujino [Wed, 8 Jun 2011 08:45:41 +0000 (08:45 +0000)]

Followup to r1133134.
I think better not dataSource but dataSourceName.

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

commit | commitdiff | tree

markt [Wed, 8 Jun 2011 00:44:14 +0000 (00:44 +0000)]

Fix regression in welcome file processing

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 23:56:14 +0000 (23:56 +0000)]

Simplify as per kkolinko's review

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 23:50:55 +0000 (23:50 +0000)]

Update changelog post valve changes

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 23:48:17 +0000 (23:48 +0000)]

Correct a regression in the fix for bug 51278 that prevented any web application from being marked as distributable. (kfujino)

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 23:47:16 +0000 (23:47 +0000)]

Enable for async requests.
Looking for stuck threads - no special async support required here.
When the asycn timeout is infinite requests may get stuck but that'll need a different detection mechanism.

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 23:43:31 +0000 (23:43 +0000)]

Enable for async requests.
Async requests should appear as serial requests when requiring multiple internal requests so concurrency should behave as expected.

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 23:37:29 +0000 (23:37 +0000)]

Enable for async requests.
Depending on how async is used, may see multiple replication requests for a single async request.

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 23:12:18 +0000 (23:12 +0000)]

Enable for async requests
Don't persist the session if processing an async request. Note: There may be some async states where the session could be safely persisted.

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

commit | commitdiff | tree

kkolinko [Tue, 7 Jun 2011 22:40:56 +0000 (22:40 +0000)]

Simplify markup: remove <br/>s from the end of lines. They are not needed inside the <source> tag.

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

commit | commitdiff | tree

kkolinko [Tue, 7 Jun 2011 22:28:45 +0000 (22:28 +0000)]

Align log4j configuration example with log4j documentation: start property names with an uppercase character.
It is just a question of style: it should work either way.

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 22:14:52 +0000 (22:14 +0000)]

Enable for async requests
Only look for a change on non-async requests. There will always be one of these before any async processing on a request so no need to check if the current request is in the middle of async processing

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 22:05:31 +0000 (22:05 +0000)]

Enable for async requests (invoke just passes the request through so no issues with async)

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 22:04:44 +0000 (22:04 +0000)]

Enable for async requests

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

commit | commitdiff | tree

kkolinko [Tue, 7 Jun 2011 21:56:16 +0000 (21:56 +0000)]

Followup to r1133122
if(flag) set flag:=false

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 19:28:42 +0000 (19:28 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51264
Improve fix to return connections to the pool when not in use.
Patch provided by Felix Schumacher.

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 19:04:41 +0000 (19:04 +0000)]

Don't use a single quote in the message

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 18:43:03 +0000 (18:43 +0000)]

7.0.15 was broken

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 18:42:36 +0000 (18:42 +0000)]

Prep for 7.0.16 tag

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 18:18:06 +0000 (18:18 +0000)]

Don't overwhelm logs with TLD scanning messages but make users aware there is room for improvement and tell them how to get at the detail.

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 17:51:43 +0000 (17:51 +0000)]

Add a few more exclusions

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 14:00:16 +0000 (14:00 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51324
Improve handling of exceptions when flushing the response buffer to ensure that the doFlush flag does not get stuck in the enabled state.
Patch provided by Jeremy Norris.

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

commit | commitdiff | tree

markt [Tue, 7 Jun 2011 09:22:44 +0000 (09:22 +0000)]

Revert r1132367. There is no issue. I got confused between AprEndpoint.SendfileData and NioEndpoint.SendfileData

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

commit | commitdiff | tree

markt [Mon, 6 Jun 2011 17:07:49 +0000 (17:07 +0000)]

Correct doc error reported on users list

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

commit | commitdiff | tree

markt [Mon, 6 Jun 2011 16:53:58 +0000 (16:53 +0000)]

Only need 1 HexUtils class

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

commit | commitdiff | tree

markt [Mon, 6 Jun 2011 16:53:37 +0000 (16:53 +0000)]

Revert r1132487 and use Konstantin's suggested fix.

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

commit | commitdiff | tree

kkolinko [Mon, 6 Jun 2011 10:05:11 +0000 (10:05 +0000)]

Set svn:eol-style=native
Fixes bug 51323 reported by sebb

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 20:26:37 +0000 (20:26 +0000)]

Parse port as base10, not hex

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 16:32:31 +0000 (16:32 +0000)]

Create a new RecycledProcessors inner class and use it in the Processor implementations rather than redefining the same thing 6 times.

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

commit | commitdiff | tree

rjung [Sun, 5 Jun 2011 15:11:34 +0000 (15:11 +0000)]

Fix Javadoc.

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 13:40:57 +0000 (13:40 +0000)]

Create an AbstactConnectionHandler and pull up the common JMX code from the AJP and HTTP connectors

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 13:16:02 +0000 (13:16 +0000)]

Pull up the request and response objects since they are common between AJP and HTTP

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 12:36:25 +0000 (12:36 +0000)]

Rename for consistency

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 12:33:29 +0000 (12:33 +0000)]

Align some of the code between the connection handlers.

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 12:20:42 +0000 (12:20 +0000)]

Consistent visibility with BIO

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 12:08:36 +0000 (12:08 +0000)]

Remove duplicated code

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 10:21:25 +0000 (10:21 +0000)]

Correctly handle range requests when using sendfile and the APR/native HTTP connector.

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 10:14:15 +0000 (10:14 +0000)]

Reformat - no functional change. Just to aid comparison

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 10:06:49 +0000 (10:06 +0000)]

Pull up parseHost

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 10:04:18 +0000 (10:04 +0000)]

Align ssl test in parseHost in BIO and NIO & APR

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 10:03:50 +0000 (10:03 +0000)]

Removed ssl attribute from NIO and APR to align with BIO

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 09:43:55 +0000 (09:43 +0000)]

Fully align parseHost
- remove unnecessary code from BIO
- improve comment for all

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

commit | commitdiff | tree

markt [Sun, 5 Jun 2011 09:02:48 +0000 (09:02 +0000)]

Start to align the parseHost method across the Http11 processors

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

commit | commitdiff | tree

markt [Sat, 4 Jun 2011 21:00:07 +0000 (21:00 +0000)]

Pull up common getExecutor code

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

commit | commitdiff | tree

markt [Sat, 4 Jun 2011 20:41:39 +0000 (20:41 +0000)]

Create an AbstractProcessor. Start to pull common code from AJP and HTTP processors to this abstract class.

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

commit | commitdiff | tree

markt [Sat, 4 Jun 2011 19:19:53 +0000 (19:19 +0000)]

Javadoc fixes

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

commit | commitdiff | tree

markt [Sat, 4 Jun 2011 19:14:42 +0000 (19:14 +0000)]

Update for next release

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

commit | commitdiff | tree

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

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51251
Add web application version support to the Ant tasks.
Based on a patch provided by Eiji Takahashi.

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

commit | commitdiff | tree

markt [Fri, 3 Jun 2011 22:13:09 +0000 (22:13 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51264
Allow the JDBC persistent session store to use a JNDI datasource to define the database in which sessions are persisted.
Patch provided by Felix Schumacher.

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

commit | commitdiff | tree

markt [Fri, 3 Jun 2011 18:07:24 +0000 (18:07 +0000)]

Fix TCK failure exposed by the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
A previous change to ensure web.xml had precedence over fragments and annotations was not complete. It handled filter definitions and servlet definitions but not servlet mappings.

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 21:18:07 +0000 (21:18 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
Changes required to original fix identified by TCK tests
Need to merge defaults before JSP->Servlet conversion since defaults define JSP servlet.

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 20:09:27 +0000 (20:09 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51309
Correct logic in catalina.sh stop when using a PID file to ensure the correct message is shown.
Patch provided by Caio Cezar.

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

commit | commitdiff | tree

fhanik [Thu, 2 Jun 2011 16:30:52 +0000 (16:30 +0000)]

More detailed information when waiting for a connection has timed out

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 16:11:16 +0000 (16:11 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51249
Correct system property replacement code so properties of the form ${...}${...} can be used without error.

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 15:54:26 +0000 (15:54 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51278
Allow ServletContainerInitializers to override settings in the global default web.xml and the host web.xml.

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

commit | commitdiff | tree

fhanik [Thu, 2 Jun 2011 15:26:21 +0000 (15:26 +0000)]

Correctly cast to the right PooledConnection

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 13:38:30 +0000 (13:38 +0000)]

Fix typo

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 13:26:16 +0000 (13:26 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51310
When stopping the Server object on shutdown call destroy() after calling stop().

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 13:10:01 +0000 (13:10 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51294
Clarify docs for unpackWAR attribute of StandardContext

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

commit | commitdiff | tree

markt [Thu, 2 Jun 2011 11:12:04 +0000 (11:12 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51276
Provide an abstraction for accessing content in JARs so the most efficient method can be selected depending on the type of URL used to identify the JAR. This improves startup time when JARs are located in $CATALINA_BASE/lib.

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

commit | commitdiff | tree

schultz [Tue, 31 May 2011 19:30:16 +0000 (19:30 +0000)]

Added 'layout' configuration for log4j loggers.

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

commit | commitdiff | tree

markt [Tue, 31 May 2011 13:06:11 +0000 (13:06 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51277
Improve error message if an application is deployed with an incomplete FORM authentication configuration.

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

commit | commitdiff | tree

markt [Sat, 28 May 2011 18:45:51 +0000 (18:45 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51274
Add missing i18n strings in PersistentManagerBase.
Patch provided by Eiji Takahashi.

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

commit | commitdiff | tree

markt [Fri, 27 May 2011 16:35:43 +0000 (16:35 +0000)]

Fix NPE triggered by r1127962

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

commit | commitdiff | tree

timw [Fri, 27 May 2011 09:55:42 +0000 (09:55 +0000)]

Adding code signing keys.

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

commit | commitdiff | tree

markt [Thu, 26 May 2011 15:27:52 +0000 (15:27 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51240
Replace the more generic CounterLatch (that has concurrency issues) with a more specific LimitLatch that (mostly) only provides the functionality required by the connectors to implement maxConnections. It also adds support for dynamically modifying maxConnections.

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

commit | commitdiff | tree

markt [Tue, 24 May 2011 16:04:08 +0000 (16:04 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51226
Add a findleaks Ant task for the Manager app.
Based on a patch by Eiji Takahashi

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

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

RSS Atom