tomcat7.0
14 years agoConnector alignment - request line reading
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

14 years agoAligning the HTTP connectors.
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

14 years agoClarify the default connectionTimeout.
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

14 years agoMake keptAlive initialization common between the connectors
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

14 years agoFix typo
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

14 years agoAdd another 3.7+ note
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

14 years agoAlign while loop test
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

14 years agoHeaders should be read with the standard connection timeout.
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

14 years agoAdd debug log message to align HTTP connectors
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

14 years agoStart timing request processing after the request line has been read and before the...
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

14 years agoRevert r1165237. Documented defaults are correct.
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

14 years agoTab police (rebuilt laptop - need to fix Eclipse config)
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

14 years agoAlign request processing between the connectors
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

14 years agoComplete alignment of process() for finishing requests
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

14 years agoPull out implementation specific processing that determines if keep-alive should...
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

14 years agoRefactoring prep for extracting sendfile code to a separate method
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

14 years agoMove stage update to before point where we might break out of the keep-alive loop
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

14 years agoStart to align the request finish code
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

14 years agoRemove unnecessary try/catch that just wraps a simple setter
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

14 years agoRemove unnecessary try/catch
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

14 years agoCorrect documentation of default connection timeout
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

14 years agoRemove unnecessary code
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

14 years agoAlign logger name with class name.
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51550
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

14 years agoFix a regression with the fix for 51653 that broke custom error page handling for...
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

14 years agoCorrect connectionLinger documentation
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

14 years agoRemove unused, undocumented configuration option
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

14 years agoAvoid IllegalArgumentException when setting maxActive less than or equal to 0.
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

14 years agoRevert r1163807:
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

14 years agobug 51741: Eclipse WTP "Serve modules without publishing" broken with tc7, needs...
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51741
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

14 years agoAs per the comment, remove the deprecated code
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51744
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51698
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51739
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51712
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

14 years agoFollowup to r1162721
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51736.
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51704
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51558
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

14 years agoFollowup for r1157874 which is a Fix for https://issues.apache.org/bugzilla/show_bug...
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

14 years agoMake the fix for https://issues.apache.org/bugzilla/show_bug.cgi?id=50394 done in...
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

14 years agoTweak the message validation.
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

14 years agoCorrect message
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

14 years agoRevert r1160772 & r1160774.
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

14 years agoDetect incomplete AJP messages and reject the associated request if one is found
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

14 years agoFollowup to r1161322.
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51713
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

14 years agoFix two typos in tomcat.nsi (uppercase vs. lowercase in a macro call and in a message)
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

14 years agoForward-port r1159673 and r1159680 from tc7.0.x
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

14 years agoAdd the ability to swallow input by specifying a null chunk
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

14 years agoAdd ability to track bytes read
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

14 years agoRename
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

14 years agoPull up refillReadBuffer()
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

14 years agoRe-order. No functional change.
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

14 years agoPull up finish() so output() is used consistently to wrote closing message
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

14 years agoPull up flush()
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

14 years agoPull up AJP SocketOutputBuffer
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

14 years agoRename since this message is used for response headers and response body
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

14 years agoOrganise code. No functional change.
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

14 years agoRemove unnecessary (duplicate) code
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

14 years agoRemove deprecated code for Tomcat 8
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

14 years agoEnsure AjpMessage header is correct for the direction in which the message is being...
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

14 years agoCorrect comment
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

14 years agoComment typo
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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=49683
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

14 years agoTimeouts are ints
markt [Tue, 16 Aug 2011 15:52:19 +0000 (15:52 +0000)]
Timeouts are ints

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

14 years agoRemove unused method
markt [Tue, 16 Aug 2011 15:51:49 +0000 (15:51 +0000)]
Remove unused method

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

14 years agoAlign keep-alive disable capability across all HTTP processors
markt [Tue, 16 Aug 2011 15:45:46 +0000 (15:45 +0000)]
Align keep-alive disable capability across all HTTP processors

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

14 years agoAlign keep-alive count tracking for HTTP
markt [Tue, 16 Aug 2011 12:19:49 +0000 (12:19 +0000)]
Align keep-alive count tracking for HTTP

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

14 years agoMake handling of keep-alive timeout consistent
markt [Tue, 16 Aug 2011 11:12:13 +0000 (11:12 +0000)]
Make handling of keep-alive timeout consistent
No need for local variable, processor has the keep-alive timeout

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

14 years agoFix generics warnings
markt [Tue, 16 Aug 2011 11:11:31 +0000 (11:11 +0000)]
Fix generics warnings

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

14 years agoNo need for local variable, processor already has the keep-alive timeout
markt [Tue, 16 Aug 2011 11:02:08 +0000 (11:02 +0000)]
No need for local variable, processor already has the keep-alive timeout

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

14 years agonOnce -> nonce for consistency
markt [Tue, 16 Aug 2011 10:03:00 +0000 (10:03 +0000)]
nOnce -> nonce for consistency

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

14 years agoBIO doesn't use comet but align code with NIO/APR.
markt [Tue, 16 Aug 2011 09:06:22 +0000 (09:06 +0000)]
BIO doesn't use comet but align code with NIO/APR.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51658
markt [Tue, 16 Aug 2011 08:46:07 +0000 (08:46 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51658
Fix copy/paste error that could trigger an NPE.
Based on a suggestion by Felix Schumacher

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

14 years agoClean-up I do not intend to back-port (non-critical and changes the Host API)
markt [Mon, 15 Aug 2011 18:50:25 +0000 (18:50 +0000)]
Clean-up I do not intend to back-port (non-critical and changes the Host API)

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51654
markt [Mon, 15 Aug 2011 18:38:16 +0000 (18:38 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51654
Log an error message if an appBase is specified that is not a directory and disable automatic deployment to prevent subsequent errors.

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

14 years agoFix benchmark tests
markt [Mon, 15 Aug 2011 16:53:42 +0000 (16:53 +0000)]
Fix benchmark tests

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51583
fhanik [Mon, 15 Aug 2011 15:06:35 +0000 (15:06 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51583

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

14 years agoRemove unused method
markt [Mon, 15 Aug 2011 14:25:05 +0000 (14:25 +0000)]
Remove unused method

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

14 years agoAlso seeing similar failures with NIO & APR
markt [Mon, 15 Aug 2011 13:52:18 +0000 (13:52 +0000)]
Also seeing similar failures with NIO & APR

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

14 years agoBetter fix for timing issues on Linux with unit tests
markt [Mon, 15 Aug 2011 13:14:12 +0000 (13:14 +0000)]
Better fix for timing issues on Linux with unit tests

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

14 years agoAttempt to fix timing issues on Linux unit tests
markt [Mon, 15 Aug 2011 13:03:34 +0000 (13:03 +0000)]
Attempt to fix timing issues on Linux unit tests

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653
markt [Mon, 15 Aug 2011 12:29:58 +0000 (12:29 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51653
Move custom error handling from Host to Context.

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

14 years agoAlign OutputBuffer initialisation across the connectors
markt [Fri, 12 Aug 2011 18:24:21 +0000 (18:24 +0000)]
Align OutputBuffer initialisation across the connectors
Reduce visibility of properties and methods

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

14 years agoAlign InputBuffer initialisation across the connectors
markt [Fri, 12 Aug 2011 17:59:22 +0000 (17:59 +0000)]
Align InputBuffer initialisation across the connectors
Remove unused code
Reduce visibility of properties and methods

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

14 years agoremove file not needed anymore
fhanik [Fri, 12 Aug 2011 15:40:01 +0000 (15:40 +0000)]
remove file not needed anymore

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

14 years agoPush down inputStream as it is only used by BIO
markt [Fri, 12 Aug 2011 15:17:50 +0000 (15:17 +0000)]
Push down inputStream as it is only used by BIO

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51650
markt [Fri, 12 Aug 2011 09:09:32 +0000 (09:09 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51650
Code clean-up

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51649
markt [Fri, 12 Aug 2011 09:00:24 +0000 (09:00 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51649
Document ThreadLocalLeakPreventionListener

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

14 years agoDocument two new compiler warnings added in Eclipse 3.7 Indigo.
kkolinko [Thu, 11 Aug 2011 13:17:20 +0000 (13:17 +0000)]
Document two new compiler warnings added in Eclipse 3.7 Indigo.
These could be Warnings, but more experience is needed first. "Ignore" are their default values.

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

14 years agoFollow up to r1156530. Filter URL (mainly in case of &).
markt [Thu, 11 Aug 2011 12:46:27 +0000 (12:46 +0000)]
Follow up to r1156530. Filter URL (mainly in case of &).

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=41718
markt [Thu, 11 Aug 2011 08:13:56 +0000 (08:13 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41718
RFC2616 says redirects should include a response body.

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

14 years agoUnregisters MBean of DataSource when web application stops.
kfujino [Thu, 11 Aug 2011 07:39:44 +0000 (07:39 +0000)]
Unregisters MBean of DataSource when web application stops.

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=41673
markt [Wed, 10 Aug 2011 18:37:56 +0000 (18:37 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=41673
Use platform line endings when reporting error messages

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51644
markt [Wed, 10 Aug 2011 17:57:25 +0000 (17:57 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51644
Annotation scanning was broken for contexts with a multi-level context path such as /a/b

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

14 years agoRemove unnecessary svn:mergeinfo properties
markt [Wed, 10 Aug 2011 13:33:59 +0000 (13:33 +0000)]
Remove unnecessary svn:mergeinfo properties

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640
markt [Wed, 10 Aug 2011 13:22:52 +0000 (13:22 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51640
Improve memory leak protection for DriverManager

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

14 years agoFix https://issues.apache.org/bugzilla/show_bug.cgi?id=51641
markt [Wed, 10 Aug 2011 11:43:09 +0000 (11:43 +0000)]
Fix https://issues.apache.org/bugzilla/show_bug.cgi?id=51641
Connections map uses NioChannel, not <SocketWrapper<NioChannel>

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