git.internetallee.de Git

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

commit | commitdiff | tree

markt [Fri, 2 Sep 2011 10:45:26 +0000 (10:45 +0000)]

Fix a regression with the fix for 51653 that broke custom error page handling for error status codes return by the authenticators.
This moves error page handling back to the host valve and also moves request listener handling to the host valve. This ensures that everything at a context level happens inside the listeners and that custom error pages are available for all context errors.

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

commit | commitdiff | tree

markt [Fri, 2 Sep 2011 09:38:16 +0000 (09:38 +0000)]

Correct connectionLinger documentation

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

commit | commitdiff | tree

markt [Fri, 2 Sep 2011 09:11:07 +0000 (09:11 +0000)]

Remove unused, undocumented configuration option

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

commit | commitdiff | tree

kfujino [Thu, 1 Sep 2011 10:26:13 +0000 (10:26 +0000)]

Avoid IllegalArgumentException when setting maxActive less than or equal to 0.
ArrayBlockingQueue doesn't allow capacity of 0 or less.

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

commit | commitdiff | tree

kkolinko [Wed, 31 Aug 2011 22:45:23 +0000 (22:45 +0000)]

Revert r1163807:
Remove subclipse:tags property.

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

commit | commitdiff | tree

slaurent [Wed, 31 Aug 2011 20:38:53 +0000 (20:38 +0000)]

bug 51741: Eclipse WTP "Serve modules without publishing" broken with tc7, needs patch in tomcat
https://issues.apache.org/bugzilla/show_bug.cgi?id=51741

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

commit | commitdiff | tree

slaurent [Wed, 31 Aug 2011 20:35:22 +0000 (20:35 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741
bug 51741: Eclipse WTP "Serve modules without publishing" broken with tc7, needs patch in tomcat

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

commit | commitdiff | tree

markt [Wed, 31 Aug 2011 17:46:22 +0000 (17:46 +0000)]

As per the comment, remove the deprecated code

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

commit | commitdiff | tree

markt [Wed, 31 Aug 2011 14:17:41 +0000 (14:17 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51744
Don't allow user code to close the JNDI context while a web app is running

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

commit | commitdiff | tree

markt [Mon, 29 Aug 2011 19:44:53 +0000 (19:44 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51698
Fix CVE-2011-3190
Prevent AJP request forgery via unread request body packet

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

commit | commitdiff | tree

markt [Mon, 29 Aug 2011 18:28:28 +0000 (18:28 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51739
Set the method when using a landing page

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

commit | commitdiff | tree

markt [Mon, 29 Aug 2011 14:40:27 +0000 (14:40 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51712
Ensure cache control headers are sent even if request is secure.
Patch provided by Michael Zampani

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

commit | commitdiff | tree

kkolinko [Mon, 29 Aug 2011 12:45:42 +0000 (12:45 +0000)]

Followup to r1162721
Get list of members only once
Improve message and code formatting

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

commit | commitdiff | tree

kfujino [Mon, 29 Aug 2011 10:30:38 +0000 (10:30 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51736.
Make rpcTimeout configurable in BackupManager.

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

commit | commitdiff | tree

markt [Fri, 26 Aug 2011 17:08:17 +0000 (17:08 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51704
Make calls to File.mkdirs() more robust and handle errors in a few places where they were ignored and should not have been.

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

commit | commitdiff | tree

markt [Fri, 26 Aug 2011 16:03:57 +0000 (16:03 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51558
No need to force the use of the StandardManager with addWebapp() since StandardContext will add it if it is not set.

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

commit | commitdiff | tree

kkolinko [Fri, 26 Aug 2011 13:07:16 +0000 (13:07 +0000)]

Followup for r1157874 which is a Fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=51583
Break loop immediately, because con is never set to null and you'll try releasing it twice.

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

commit | commitdiff | tree

kkolinko [Fri, 26 Aug 2011 12:24:56 +0000 (12:24 +0000)]

Make the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50394 done in r1148815 more explicit.
No functional change.

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

commit | commitdiff | tree

markt [Thu, 25 Aug 2011 14:45:13 +0000 (14:45 +0000)]

Tweak the message validation.
Body messages don't have terminators

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

commit | commitdiff | tree

markt [Thu, 25 Aug 2011 13:06:04 +0000 (13:06 +0000)]

Correct message

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

commit | commitdiff | tree

markt [Thu, 25 Aug 2011 12:30:22 +0000 (12:30 +0000)]

Revert r1160772 & r1160774.
These changes turned out to be unnecessary.

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

commit | commitdiff | tree

markt [Thu, 25 Aug 2011 10:38:32 +0000 (10:38 +0000)]

Detect incomplete AJP messages and reject the associated request if one is found

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

commit | commitdiff | tree

kkolinko [Thu, 25 Aug 2011 00:25:33 +0000 (00:25 +0000)]

Followup to r1161322.
Do not pass exception to message template, because exception itself is logged as well.
Remove argument from message templates that is never passed.

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

commit | commitdiff | tree

kkolinko [Wed, 24 Aug 2011 23:46:50 +0000 (23:46 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51713
Improve message that is logged if there is a typo in the value of protocol in a <Connector> element.

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

commit | commitdiff | tree

kkolinko [Wed, 24 Aug 2011 22:45:00 +0000 (22:45 +0000)]

Fix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a message)

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

commit | commitdiff | tree

kkolinko [Wed, 24 Aug 2011 22:25:03 +0000 (22:25 +0000)]

Forward-port r1159673 and r1159680 from tc7.0.x
Fixes http://issues.apache.org/bugzilla/show_bug.cgi?id=51688
JreMemoryLeakPreventionListener now protects against AWT thread creation. (schultz)

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 16:22:03 +0000 (16:22 +0000)]

Add the ability to swallow input by specifying a null chunk

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 16:20:42 +0000 (16:20 +0000)]

Add ability to track bytes read

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 16:17:20 +0000 (16:17 +0000)]

Rename

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 14:50:27 +0000 (14:50 +0000)]

Pull up refillReadBuffer()

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 14:47:50 +0000 (14:47 +0000)]

Re-order. No functional change.

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 12:19:20 +0000 (12:19 +0000)]

Pull up finish() so output() is used consistently to wrote closing message

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 11:40:05 +0000 (11:40 +0000)]

Pull up flush()
APR (like BIO and NIO) now writes each AJP packet to the socket as soon as it is ready

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 11:07:29 +0000 (11:07 +0000)]

Pull up AJP SocketOutputBuffer

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 11:00:02 +0000 (11:00 +0000)]

Rename since this message is used for response headers and response body

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 10:41:02 +0000 (10:41 +0000)]

Organise code. No functional change.

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

commit | commitdiff | tree

markt [Tue, 23 Aug 2011 09:17:59 +0000 (09:17 +0000)]

Remove unnecessary (duplicate) code

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

commit | commitdiff | tree

markt [Mon, 22 Aug 2011 17:56:32 +0000 (17:56 +0000)]

Remove deprecated code for Tomcat 8

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

commit | commitdiff | tree

markt [Mon, 22 Aug 2011 17:55:14 +0000 (17:55 +0000)]

Ensure AjpMessage header is correct for the direction in which the message is being sent

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

commit | commitdiff | tree

markt [Mon, 22 Aug 2011 17:23:12 +0000 (17:23 +0000)]

Correct comment

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

commit | commitdiff | tree

markt [Tue, 16 Aug 2011 20:40:23 +0000 (20:40 +0000)]

Comment typo

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

commit | commitdiff | tree

markt [Tue, 16 Aug 2011 19:28:06 +0000 (19:28 +0000)]

Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=49683
Use separate timeouts for socket Timeout and keep-alive timeout

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

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

RSS Atom