git.internetallee.de Git

markt [Thu, 22 Sep 2011 19:37:57 +0000 (19:37 +0000)]

Remove some unused code

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 19:36:54 +0000 (19:36 +0000)]

Suppress warning that is hard (impossible?) to avoid

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 19:34:16 +0000 (19:34 +0000)]

Remove unused code

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 19:33:03 +0000 (19:33 +0000)]

Remove unused code

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 19:21:19 +0000 (19:21 +0000)]

Remove unnecessary code

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 19:19:16 +0000 (19:19 +0000)]

Revert r1174322 and apply the correct fix

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 19:12:01 +0000 (19:12 +0000)]

Fix a small number of Eclipse warnings.
- Unused code
- Unnecessary null checks

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 19:06:52 +0000 (19:06 +0000)]

Fix Eclipse warning - unused throws

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

commit | commitdiff | tree

rjung [Thu, 22 Sep 2011 16:08:33 +0000 (16:08 +0000)]

Fix docs typo.

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

commit | commitdiff | tree

markt [Thu, 22 Sep 2011 11:21:08 +0000 (11:21 +0000)]

Fix running under a security manager

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

commit | commitdiff | tree

kkolinko [Wed, 21 Sep 2011 22:12:36 +0000 (22:12 +0000)]

Replace explicit Tomcat version with a template - for Tomcat 8.

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

commit | commitdiff | tree

kkolinko [Wed, 21 Sep 2011 15:35:47 +0000 (15:35 +0000)]

Followup to r1173630
Simplify code: methodName can be tested once per iteration

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

commit | commitdiff | tree

markt [Wed, 21 Sep 2011 14:14:22 +0000 (14:14 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51860
Fix issues when using NIO, SSL and a custom SSLImplementation.
Based on a suggestion by Roman Tsirulnikov.

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

commit | commitdiff | tree

markt [Wed, 21 Sep 2011 13:33:51 +0000 (13:33 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51852
Correct 2 issues in varargs handling
- Incorrectly constructed varargs arguments (resulting in
ArrayIndexOutOfBoundsExceptions)
- Incorrectly detected matching varargs methods
Patch (with a test case!) provided by Matt Benson

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

commit | commitdiff | tree

kkolinko [Wed, 21 Sep 2011 13:14:29 +0000 (13:14 +0000)]

Simplify code in NioEndpoint$Poller.
The events.size() call is costly, because it is a loop that counts entries in a linked queue.
Actually it is not needed here at all, because we iterate the queue by ourselves.

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

commit | commitdiff | tree

kfujino [Wed, 21 Sep 2011 02:07:24 +0000 (02:07 +0000)]

followup r1173088 and r1173090.

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

commit | commitdiff | tree

schultz [Tue, 20 Sep 2011 20:30:10 +0000 (20:30 +0000)]

Fixed bug #51580: Severe error deploying WAR application (ExpandWar error)
- Added error mesage when JarEntry InputStream cannot be found due to a broken WAR file

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

commit | commitdiff | tree

schultz [Tue, 20 Sep 2011 20:17:23 +0000 (20:17 +0000)]

Fixed bug #51687: Improve JreMemoryLeakPreventionListener against leak caused by sun.java2d.Disposer
- Added (optional) protection against sun.java2d.Disposer thread pinning a WebappClassLoader into memory in the JreMemoryLeakPreventionListener.

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

commit | commitdiff | tree

markt [Tue, 20 Sep 2011 18:17:06 +0000 (18:17 +0000)]

Modify test to account for behaviours of different platforms and different connectors.

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

commit | commitdiff | tree

markt [Tue, 20 Sep 2011 17:08:41 +0000 (17:08 +0000)]

Ensure that when the connector is stopped that a Comet END event is processed to signal to the app and to close the socket

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

commit | commitdiff | tree

markt [Tue, 20 Sep 2011 16:46:17 +0000 (16:46 +0000)]

5s is plenty when things are working and 10s is too long when they aren't.

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

commit | commitdiff | tree

markt [Tue, 20 Sep 2011 11:54:44 +0000 (11:54 +0000)]

Revert accidental commit

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

commit | commitdiff | tree

rjung [Tue, 20 Sep 2011 11:36:29 +0000 (11:36 +0000)]

- Pull up common clode code to base class.
- Add sessionAttributeFilter to clone method
- Reduce visibility of notifyListenersOnReplication

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

commit | commitdiff | tree

rjung [Tue, 20 Sep 2011 11:32:49 +0000 (11:32 +0000)]

Pull up members "cluster" and "notifyListenersOnReplication"
to common base class.

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

commit | commitdiff | tree

markt [Tue, 20 Sep 2011 11:02:41 +0000 (11:02 +0000)]

Remove empty comment

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

commit | commitdiff | tree

markt [Tue, 20 Sep 2011 08:36:18 +0000 (08:36 +0000)]

Remove debug use of System.out
Add missing volatile

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

commit | commitdiff | tree

markt [Tue, 20 Sep 2011 08:33:44 +0000 (08:33 +0000)]

Better detection of thread termination at end of test
Better failure messages so it is easier to see the cause of any failure immediately

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

commit | commitdiff | tree

markt [Mon, 19 Sep 2011 17:14:10 +0000 (17:14 +0000)]

Don't add to Poller when socket is closing to prevent NPEs.

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

commit | commitdiff | tree

markt [Mon, 19 Sep 2011 16:30:36 +0000 (16:30 +0000)]

Fix threading issue with changing visibility of methods and fields

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

commit | commitdiff | tree

markt [Mon, 19 Sep 2011 15:31:43 +0000 (15:31 +0000)]

Fix resource leak in annotations cache that prevented unloading of resources that used annotations

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

commit | commitdiff | tree

markt [Mon, 19 Sep 2011 13:19:27 +0000 (13:19 +0000)]

JSP unloading code was retaining a reference to the unloaded JSP preventing the associated class from being unloaded until the JSP that replaced it was unloaded.

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

commit | commitdiff | tree

markt [Mon, 19 Sep 2011 10:11:44 +0000 (10:11 +0000)]

Always process postConstruct / preDestroy annotations but only process resource annotations if JNDI is enabled.

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

commit | commitdiff | tree

markt [Mon, 19 Sep 2011 10:04:37 +0000 (10:04 +0000)]

Revert previous commit (r1172546). Need to fix cause rather than symptom.

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

commit | commitdiff | tree

markt [Mon, 19 Sep 2011 10:00:04 +0000 (10:00 +0000)]

Prevent NPE if JNDI is disabled.

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

commit | commitdiff | tree

rjung [Sun, 18 Sep 2011 13:30:12 +0000 (13:30 +0000)]

Add two new Java 7 Jars to jarsToSkip.

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

commit | commitdiff | tree

rjung [Sun, 18 Sep 2011 13:04:25 +0000 (13:04 +0000)]

Fix javadoc and comment typo.

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

commit | commitdiff | tree

rjung [Sun, 18 Sep 2011 12:22:39 +0000 (12:22 +0000)]

BZ 51811: Fix typo in attribute name
(sslImplementationName instead of
sslImplemenationName).

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

commit | commitdiff | tree

rjung [Sun, 18 Sep 2011 09:33:21 +0000 (09:33 +0000)]

Document new "sessionAttributeFilter" for cluster
managers.

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

commit | commitdiff | tree

rjung [Sun, 18 Sep 2011 09:21:24 +0000 (09:21 +0000)]

Support a regexp based filter of attribute
names in ClusterManagerBase and DeltaSession.

Only attributes whose names match will be
distributed. An empty filter means all attributes
will be distributed (unchanged default behaviour).

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

commit | commitdiff | tree

rjung [Sun, 18 Sep 2011 09:20:00 +0000 (09:20 +0000)]

Allow to overwrite check for distributability
of session attributes by session implementations.

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

commit | commitdiff | tree

kkolinko [Fri, 16 Sep 2011 17:46:35 +0000 (17:46 +0000)]

Report tests failure only after all three variants (BIO,NIO,APR) have been run. Do not stop on 1/3 or 2/3.

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

commit | commitdiff | tree

fhanik [Wed, 14 Sep 2011 14:39:05 +0000 (14:39 +0000)]

https://issues.apache.org/bugzilla/show_bug.cgi?id=51794
Fix race condition in selector potentially causing a delay in select operations

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

commit | commitdiff | tree

kfujino [Wed, 14 Sep 2011 09:05:40 +0000 (09:05 +0000)]

Additional fix for r1170479.
Make sure calling disconnect() when only setDiscarded(true) is called and the real connection is not closed.

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

commit | commitdiff | tree

kfujino [Wed, 14 Sep 2011 08:53:58 +0000 (08:53 +0000)]

Fix BZ51786.
Discarded connection is not active in a pool any longer.
It removes from the active connection list.

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

commit | commitdiff | tree

fhanik [Mon, 12 Sep 2011 15:25:13 +0000 (15:25 +0000)]

typo in decorator
https://issues.apache.org/bugzilla/show_bug.cgi?id=48392

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

commit | commitdiff | tree

rjung [Sun, 11 Sep 2011 13:14:23 +0000 (13:14 +0000)]

The cache only gets populated if the context is
not null.

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

commit | commitdiff | tree

kkolinko [Fri, 9 Sep 2011 23:25:03 +0000 (23:25 +0000)]

Followup to r1164567, because not all occurences have been replaced.

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51758
Align the digester logger names with the class name else users will never be able to figure out how to stop it logging

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

commit | commitdiff | tree

kkolinko [Fri, 9 Sep 2011 21:30:28 +0000 (21:30 +0000)]

Reviewing r1166576...
Improve performance of Http11Processor.disableKeepAlive(): call getMaxThreads() first and do not call getCurrentThreadsBusy() twice,
because ThreadPoolExecutor.getActiveCount() in JRE is implemented as a loop that counts threads and that should be expensive.

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 15:39:11 +0000 (15:39 +0000)]

Fix Eclipse warnings in unit tests

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 15:37:06 +0000 (15:37 +0000)]

Fix possible NPE if instances aren't created through the DefaultInstanceManager but are destroyed through it.

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 15:14:43 +0000 (15:14 +0000)]

Fix remaining Eclipse warnings in jdbc-pool unit tests

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 14:54:52 +0000 (14:54 +0000)]

Fix Eclipse warnings

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 14:37:44 +0000 (14:37 +0000)]

Remove unnecessary casts

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 14:32:51 +0000 (14:32 +0000)]

Test inrange rather than ignoring the value

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 14:32:08 +0000 (14:32 +0000)]

Fix Eclipse warnings

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 14:28:22 +0000 (14:28 +0000)]

Fix Eclipse warnings

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 13:58:53 +0000 (13:58 +0000)]

Remove unused code

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 13:54:27 +0000 (13:54 +0000)]

Remove unused import

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 13:53:02 +0000 (13:53 +0000)]

Remove deprecated code

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 13:43:02 +0000 (13:43 +0000)]

Tomcat 6 introduced a custom attribute for SSL session ID.
Servlet 3 introduced a standard attribute for this.
Support both, deprecating the custom attribute.

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

commit | commitdiff | tree

markt [Thu, 8 Sep 2011 10:57:19 +0000 (10:57 +0000)]

Add caching of postConstruct and preDestroy annotations

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

commit | commitdiff | tree

kfujino [Thu, 8 Sep 2011 10:54:05 +0000 (10:54 +0000)]

validatorClassName and suspectTimeout are ignored.
In order to support them correctly, validatorClassName and suspectTimeout are added to property list.

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

commit | commitdiff | tree

markt [Wed, 7 Sep 2011 20:07:22 +0000 (20:07 +0000)]

Reduce cache memory usage for classes with no annotations. Review comment from kkolinko.

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

commit | commitdiff | tree

markt [Wed, 7 Sep 2011 18:11:20 +0000 (18:11 +0000)]

Add a simple annotation cache to improve performance for applications that use lots of non-poolable tags.

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

commit | commitdiff | tree

markt [Wed, 7 Sep 2011 12:36:31 +0000 (12:36 +0000)]

Make sure connections are only kept open for keep alive.

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

commit | commitdiff | tree

markt [Wed, 7 Sep 2011 12:31:30 +0000 (12:31 +0000)]

async more likely than comet

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

commit | commitdiff | tree

markt [Wed, 7 Sep 2011 09:22:36 +0000 (09:22 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51744
Use method Set rather than EnumSet since the method signature uses Set.

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 23:07:00 +0000 (23:07 +0000)]

Pull up the process() method

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 22:56:40 +0000 (22:56 +0000)]

Handle infinite timeouts for both soTimeout and keepAliveTimeout

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 18:39:41 +0000 (18:39 +0000)]

Fix timeouts broken by refactoring

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 17:35:39 +0000 (17:35 +0000)]

Fix keep-alive broken by refactoring

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 16:16:28 +0000 (16:16 +0000)]

Connector alignment - final tweaks to the process method

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 16:05:29 +0000 (16:05 +0000)]

Align connectors - setting timeouts

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 15:55:53 +0000 (15:55 +0000)]

Remove unnecessary setting of timeout (will have been correctly set in setRequestLineReadTimeout())

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 15:54:51 +0000 (15:54 +0000)]

More connector alignment - request header parsing

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 15:49:43 +0000 (15:49 +0000)]

Connector alignment - this parameter is ignored with BIO

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 15:45:08 +0000 (15:45 +0000)]

Connector alignment - request line reading

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 15:00:02 +0000 (15:00 +0000)]

Aligning the HTTP connectors.
Handle request line timeouts consistently
Handle upload timeouts more consistently

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 14:14:27 +0000 (14:14 +0000)]

Clarify the default connectionTimeout.
Add info on setting infinite timeouts.

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 11:26:30 +0000 (11:26 +0000)]

Make keptAlive initialization common between the connectors

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 11:12:35 +0000 (11:12 +0000)]

Fix typo

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

commit | commitdiff | tree

markt [Tue, 6 Sep 2011 11:12:17 +0000 (11:12 +0000)]

Add another 3.7+ note

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 17:25:31 +0000 (17:25 +0000)]

Align while loop test

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 17:18:50 +0000 (17:18 +0000)]

Headers should be read with the standard connection timeout.
The upload timeout should only be used for the request body.

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 16:59:27 +0000 (16:59 +0000)]

Add debug log message to align HTTP connectors

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 16:54:25 +0000 (16:54 +0000)]

Start timing request processing after the request line has been read and before the request headers are read (aligns with other HTTP connectors)

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 16:35:17 +0000 (16:35 +0000)]

Revert r1165237. Documented defaults are correct.

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 16:14:46 +0000 (16:14 +0000)]

Tab police (rebuilt laptop - need to fix Eclipse config)

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 15:31:46 +0000 (15:31 +0000)]

Align request processing between the connectors

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 15:21:22 +0000 (15:21 +0000)]

Complete alignment of process() for finishing requests

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 15:03:51 +0000 (15:03 +0000)]

Pull out implementation specific processing that determines if keep-alive should be broken into a separate method.

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 13:45:14 +0000 (13:45 +0000)]

Refactoring prep for extracting sendfile code to a separate method

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 13:21:28 +0000 (13:21 +0000)]

Move stage update to before point where we might break out of the keep-alive loop

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 12:09:28 +0000 (12:09 +0000)]

Start to align the request finish code

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 11:57:05 +0000 (11:57 +0000)]

Remove unnecessary try/catch that just wraps a simple setter

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 11:55:31 +0000 (11:55 +0000)]

Remove unnecessary try/catch
The methods it contained were either simple setters or already provided exactly the same exception handling

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 10:57:13 +0000 (10:57 +0000)]

Correct documentation of default connection timeout

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

commit | commitdiff | tree

markt [Mon, 5 Sep 2011 10:47:43 +0000 (10:47 +0000)]

Remove unnecessary code
Timeout is set when socket is created and further changes are handled inside the while loop

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

commit | commitdiff | tree

markt [Fri, 2 Sep 2011 15:01:33 +0000 (15:01 +0000)]

Align logger name with class name.

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

commit | commitdiff | tree

markt [Fri, 2 Sep 2011 11:26:14 +0000 (11:26 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51550
Use context error pages where possible e.g. for authenticator errors

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