git.internetallee.de Git

markt [Sat, 2 Jul 2011 12:01:30 +0000 (12:01 +0000)]

Only add instance if it has just been created.

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

commit | commitdiff | tree

markt [Sat, 2 Jul 2011 11:29:46 +0000 (11:29 +0000)]

Correct deadlock introduced in r1142112

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 22:47:46 +0000 (22:47 +0000)]

When using Servlets that implement the SingleThreadModel interface, add the single instance created to the pool when it is determined that a pool of servlets is required rather than throwing it away.

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 22:44:04 +0000 (22:44 +0000)]

Prevent test failures when two objects get generated with the same hashCode

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 21:50:14 +0000 (21:50 +0000)]

Read/write by multiple threads outside sync - needs to be volatile

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

commit | commitdiff | tree

kkolinko [Fri, 1 Jul 2011 20:20:33 +0000 (20:20 +0000)]

In Tomcat.initBaseDir():
set a value for catalina.home only if it has not been set previously.

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

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

commit | commitdiff | tree

kkolinko [Fri, 1 Jul 2011 19:46:00 +0000 (19:46 +0000)]

Followup to r1140693
Declare a separate public method for the new use case of makeJavaIdentifier(),
instead of passing the "false" flag as an argument.

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 18:06:08 +0000 (18:06 +0000)]

Add support for configuring the shutdown port

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 17:35:09 +0000 (17:35 +0000)]

Build server.xml for the installer by search and replace rather than combining fragments. No ore work to keep the original and the fragments in sync and esy to expand to add additional search/replace as well as insertions etc.

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 16:25:28 +0000 (16:25 +0000)]

Use specified AJP port rather than always using default

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 14:52:24 +0000 (14:52 +0000)]

Consistent reporting for the connectors

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 14:15:48 +0000 (14:15 +0000)]

Fix possible NPE when serving STM servlets

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 14:05:00 +0000 (14:05 +0000)]

If things go wrong, don't wait forever for the latch.

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 13:41:25 +0000 (13:41 +0000)]

Fix faulty test

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

commit | commitdiff | tree

markt [Fri, 1 Jul 2011 10:03:04 +0000 (10:03 +0000)]

Seen on Windows too (less frequently)

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

commit | commitdiff | tree

markt [Thu, 30 Jun 2011 15:41:27 +0000 (15:41 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51453
Fix a regression in the preemptive authentication support (enhancement <bug>12428</bug>) that could trigger authentication even if preemptive authentication was disabled.

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

commit | commitdiff | tree

markt [Thu, 30 Jun 2011 12:16:37 +0000 (12:16 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51445
Correctly initialise all instances of Servlets that implement SingleThreadModel.
Based on a patch by Felix Schumacher.

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

commit | commitdiff | tree

markt [Thu, 30 Jun 2011 11:58:36 +0000 (11:58 +0000)]

Improve the handling for Servlets that implement the deprecated SingleThreadModel when embedding Tomcat.

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

commit | commitdiff | tree

kfujino [Thu, 30 Jun 2011 08:39:53 +0000 (08:39 +0000)]

The change in session ID is notified to the container event listener.

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

commit | commitdiff | tree

markt [Wed, 29 Jun 2011 22:34:37 +0000 (22:34 +0000)]

Fix bad logic. Need to postProcess if socket is *not* closed and it is an async request.

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

commit | commitdiff | tree

markt [Wed, 29 Jun 2011 15:16:02 +0000 (15:16 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51450
More Spanish translations.
Based on a patch by Jesus Marin.

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

commit | commitdiff | tree

markt [Wed, 29 Jun 2011 13:56:28 +0000 (13:56 +0000)]

Better error handling that may help track down the cause of https://issues.apache.org/bugzilla/show_bug.cgi?id=51088

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

commit | commitdiff | tree

markt [Wed, 29 Jun 2011 12:57:50 +0000 (12:57 +0000)]

Ensure that if asyncDispatch() is called during an onTimeout event and the target Servlet does not call startAsync() or complete() that Tomcat calls complete() (or does the equivalent) once the target Servlet exits.

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

commit | commitdiff | tree

markt [Wed, 29 Jun 2011 12:12:48 +0000 (12:12 +0000)]

Ensure an access log entry is made if an error occurs during asynchronous request processing and the socket is immediately closed.

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

commit | commitdiff | tree

markt [Wed, 29 Jun 2011 11:19:55 +0000 (11:19 +0000)]

If the socket is closed (i.e. due to an error) no need to postProcess

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

commit | commitdiff | tree

markt [Wed, 29 Jun 2011 00:06:20 +0000 (00:06 +0000)]

Fix what were originally typos
Similar to https://issues.apache.org/bugzilla/show_bug.cgi?id=50648

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 23:45:52 +0000 (23:45 +0000)]

Fix what was originally a typo
Similar to https://issues.apache.org/bugzilla/show_bug.cgi?id=50648

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 19:35:06 +0000 (19:35 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51443
Document the notifySessionListenersOnReplication attribute for the DeltaManager.

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 19:32:39 +0000 (19:32 +0000)]

Notifications of changes in session ID to other nodes in the cluster should be controlled by notifySessionListenersOnReplication rather than notifyListenersOnReplication.

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

commit | commitdiff | tree

schultz [Tue, 28 Jun 2011 18:55:57 +0000 (18:55 +0000)]

Added symmetric sslAvailable=false in terminateAPR.

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 18:00:50 +0000 (18:00 +0000)]

Add a test case for https://issues.apache.org/bugzilla/show_bug.cgi?id=51445

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 17:49:25 +0000 (17:49 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51436
Send 100 (Continue) response earlier to enable ServletRequestListener implementations to read the request body.
Based on a patch by Simon Olofsson.

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 17:24:45 +0000 (17:24 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50353
Rather than the eventual NPE, throw an ISE if an application attempts to access an AsyncContext after the request processing has ended.

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 16:22:08 +0000 (16:22 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51447
Viewing a back up session in the HTML Manager web application no longer changes the session to a primary session.
Based on a patch provided by Eiji Takahashi.

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 16:06:32 +0000 (16:06 +0000)]

More https://issues.apache.org/bugzilla/show_bug.cgi?id=51400 related changes
Based on a patch by Konstantin Preißer

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 15:56:23 +0000 (15:56 +0000)]

Additional fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=36362 to address regression for attributes with names that include underscores

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 14:37:59 +0000 (14:37 +0000)]

Increase size of file the test tries to send since there is enough buffering on my system that 200k can hide in the buffers triggering a test failure (the limit works - it just fails in a way the test doesn't expect)

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 13:57:17 +0000 (13:57 +0000)]

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 07:22:28 +0000 (07:22 +0000)]

Fix the remaining instances of new String(byte[] b, String enc) that can be fixed

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

commit | commitdiff | tree

markt [Tue, 28 Jun 2011 07:15:02 +0000 (07:15 +0000)]

No need for a ConcurrentHashMap now pre-population is used.

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 23:12:10 +0000 (23:12 +0000)]

Update for recent changes

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 22:13:39 +0000 (22:13 +0000)]

Use a more reliable method to expire sessions.

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 16:01:32 +0000 (16:01 +0000)]

Simplify.
Covert aliases to lower case too.

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 15:19:22 +0000 (15:19 +0000)]

Need to include aliases in charset cache

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 15:11:45 +0000 (15:11 +0000)]

Remove upgrading info - it has been added to the site

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 13:57:23 +0000 (13:57 +0000)]

Remove unused files

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

commit | commitdiff | tree

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

Pre-populate Charset cache.
Since cache is pre-populated, no need to look up non-matching values which effectively caches misses too.

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 13:23:28 +0000 (13:23 +0000)]

Prevent multiple variations of the same sncoding filling up the cache

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

commit | commitdiff | tree

markt [Mon, 27 Jun 2011 10:23:45 +0000 (10:23 +0000)]

Fix typo

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

commit | commitdiff | tree

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

Fix CVE-2011-2204.
Prevent user passwords appearing in log files if a runtime exception (e.g. OOME) occurs while creating a new user for a MemoryUserDatabase via JMX.

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

commit | commitdiff | tree

rjung [Sun, 26 Jun 2011 18:34:10 +0000 (18:34 +0000)]

Use "eval exec" instead of "eval" for
"catalina.sh run".

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

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

commit | commitdiff | tree

markt [Sat, 25 Jun 2011 17:47:46 +0000 (17:47 +0000)]

Add an upgrade page to the documentation that can be used to determine the changes in any of the configuration files between two given versions.

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

commit | commitdiff | tree

markt [Fri, 24 Jun 2011 16:43:40 +0000 (16:43 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
Provide the ability to specify the AJP port and service name when installing Tomcat using the Windows installer. This permits multiple instances of the same Tomcat version to be installed side-by-side.

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

commit | commitdiff | tree

markt [Fri, 24 Jun 2011 15:22:30 +0000 (15:22 +0000)]

Disable the shutdown port when running as a service. One less port to conflict when installing multiple services.

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

commit | commitdiff | tree

markt [Fri, 24 Jun 2011 13:25:25 +0000 (13:25 +0000)]

Remove unused code

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

commit | commitdiff | tree

rjung [Fri, 24 Jun 2011 12:48:20 +0000 (12:48 +0000)]

Fix IllegalStateException for JavaScript files
when switching from Writer to OutputStream.

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

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

commit | commitdiff | tree

rjung [Fri, 24 Jun 2011 05:39:19 +0000 (05:39 +0000)]

Correctly support 'S' and 'SSS' in SimpleDateFormat
timestamps for the AccessLogValve.

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

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

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

commit | commitdiff | tree

rjung [Fri, 24 Jun 2011 05:33:35 +0000 (05:33 +0000)]

Remove dead code and correct comment about
thread-safetyness.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 23:24:36 +0000 (23:24 +0000)]

Prep for fixing https://issues.apache.org/bugzilla/show_bug.cgi?id=50949
Use a variable for the service name and ensure the uninstaller still works

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 22:35:22 +0000 (22:35 +0000)]

Use a function to start the service so the service name can be changed during the install

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 22:25:12 +0000 (22:25 +0000)]

Remove inaccurate comment

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 22:01:41 +0000 (22:01 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=40510
Provide an option to install shortcuts for the current user or all users. Also ensure registry is correctly cleaned on uninstall for 64-bit platforms.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 18:27:39 +0000 (18:27 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=33262
Install monitor to auto-start for current user only rather than all users to be consistent with menu item creation.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 15:54:43 +0000 (15:54 +0000)]

Add important missing word

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 15:51:55 +0000 (15:51 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=36362
Handle the case where tag file attributes (which can use any valid XML name) have a name which is not a Java identifier.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 13:50:40 +0000 (13:50 +0000)]

Improve JMX unit test.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 12:18:20 +0000 (12:18 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51425
Update Spanish translations.
Based on a patch provided by Jesus Marin.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 12:08:31 +0000 (12:08 +0000)]

Follow-up to r1137925:
Use buf.add(char) when there is a single character string.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 11:44:39 +0000 (11:44 +0000)]

Move the statics out of the "instance variable" section

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 11:27:57 +0000 (11:27 +0000)]

Remove unnecessary variable BASEDIR from scripts.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 11:01:02 +0000 (11:01 +0000)]

Use system properties loaded from catalina.properties
via the class path in unit tests.

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

commit | commitdiff | tree

rjung [Thu, 23 Jun 2011 10:57:18 +0000 (10:57 +0000)]

Remove redundant copy of catalina.properties from
o.a.c.startup. Generate this copy for inclusion in
bin and src jars during the ant "compile" task.

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:31:39 +0000 (09:31 +0000)]

Remove unused code

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:31:10 +0000 (09:31 +0000)]

Don't cache xml parsing config locally, get it from the Context

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:26:10 +0000 (09:26 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51395
Better fix for memory leak that aligns ContextConfig with TldConfig

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

commit | commitdiff | tree

markt [Thu, 23 Jun 2011 09:00:51 +0000 (09:00 +0000)]

Revert r1137753 - I have a better soution in mind

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

commit | commitdiff | tree

kkolinko [Thu, 23 Jun 2011 00:10:23 +0000 (00:10 +0000)]

Amend description for the fix applied in r1132700.
The problem there was less severe than it sounds:
The port number was not treated as hex. The arithmetics to summ up the digits has already been using base 10.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:40:30 +0000 (23:40 +0000)]

Connector refactoring
SocketWrapper changes for AJP processor

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

commit | commitdiff | tree

kkolinko [Wed, 22 Jun 2011 23:39:58 +0000 (23:39 +0000)]

Followup to r1138573
Improve support for embedding Tomcat 7.

Expose the string that was used to suppress loading default web.xml as a constant. Short-circuit the attempt to load the web.xml file when this magic value is used. Thus saving us from unneeded getResourceAsStream() call.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:39:05 +0000 (23:39 +0000)]

Connector refactoring
SocketWrapper changes for HTTP processor

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:33:39 +0000 (23:33 +0000)]

Connector refactoring
Rename socketWrapper to socket to align with BIO/APR

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:32:17 +0000 (23:32 +0000)]

Remove the local socket object

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:29:51 +0000 (23:29 +0000)]

Connector refactoring
Another small step towards SocketWrapper for NIO

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:25:43 +0000 (23:25 +0000)]

Connector refactoring
Another small step towards SocketWrapper for NIO

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:17:14 +0000 (23:17 +0000)]

Connector refactoring
Another small step towards SocketWrapper for NIO

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 23:13:37 +0000 (23:13 +0000)]

Connector refactoring.
Start moving the NIO connectors towards using SocketWrapper<NioChannel> rather than NioChannel to align them with BIO/APR and permit further refactoring.
Do this in small steps since when I tried to do it in one hit, everything broke.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 18:30:41 +0000 (18:30 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51418
Provide more control over Context creation when embedding Tomcat.
Based on a patch by Benson Margulies.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 17:11:03 +0000 (17:11 +0000)]

Fix copy/paste error that broke crl handling

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 16:53:58 +0000 (16:53 +0000)]

No functional change.
Refactoring so all attributes are handled the same way.

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

commit | commitdiff | tree

markt [Wed, 22 Jun 2011 14:59:11 +0000 (14:59 +0000)]

Further improvements to startup performance.
Use File URLs where they can be determined for speed.

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:44:58 +0000 (18:44 +0000)]

Fix Eclipse warnings in Valves

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:41:42 +0000 (18:41 +0000)]

Fix Eclipse warnings / remove unused code

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:34:46 +0000 (18:34 +0000)]

Another fp

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:32:41 +0000 (18:32 +0000)]

Fix warnings in SSI package

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 18:15:56 +0000 (18:15 +0000)]

Remove unused code

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 14:39:17 +0000 (14:39 +0000)]

Revert to previous, no need for Charset here.

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 14:29:49 +0000 (14:29 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51400
Avoid known bottleneck in JVM when converting between Strings and bytes by always providing a Charset rather than an encoding name.
Based on a patch by Dave Engberg.

Note: There are some Charsets that the JVM must support and in those cases Charset.forName(String) should not throw an exception.

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

commit | commitdiff | tree

kkolinko [Tue, 21 Jun 2011 13:24:44 +0000 (13:24 +0000)]

Avoid NullPointerException in JULI FileHandler if formatter is misconfigured
Fixes https://issues.apache.org/bugzilla/post_bug.cgi

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

commit | commitdiff | tree

markt [Tue, 21 Jun 2011 11:10:47 +0000 (11:10 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51401
Correctly initialise shared WebRuleSet instance used by the digesters that parse web.xml and prevent incorrect warnings about multiple occurrences of elements that are only allowed to appear once in web.xml and web-fragment.xml.
Patch by kfujino

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

commit | commitdiff | tree

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

Add missing comma

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

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

RSS Atom