tomcat7.0
19 years ago- Use a single reference to the cache during lookup (the cache array could be concurr...
remm [Wed, 2 Aug 2006 00:39:28 +0000 (00:39 +0000)]
- Use a single reference to the cache during lookup (the cache array could be concurrently replaced).

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

19 years ago- Stop wrappers a bit earlier.
remm [Tue, 1 Aug 2006 11:57:41 +0000 (11:57 +0000)]
- Stop wrappers a bit earlier.

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

19 years ago- JSP 2.1 API fixes.
remm [Fri, 28 Jul 2006 13:57:53 +0000 (13:57 +0000)]
- JSP 2.1 API fixes.

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

19 years agoPort of fix for bug 39592. Stop stack traces for HEAD requests.
markt [Thu, 27 Jul 2006 00:34:35 +0000 (00:34 +0000)]
Port of fix for bug 39592. Stop stack traces for HEAD requests.

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

19 years ago- Experiment with using concurrent maps in places which may be concurrently accessed.
remm [Tue, 25 Jul 2006 14:19:32 +0000 (14:19 +0000)]
- Experiment with using concurrent maps in places which may be concurrently accessed.

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

19 years agoPort fix for bug 40053. Correct app deployment doc with respect to shared lib and...
markt [Sat, 22 Jul 2006 22:04:22 +0000 (22:04 +0000)]
Port fix for bug 40053. Correct app deployment doc with respect to shared lib and CATALINA_BASE.

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

19 years agoPort fix bug 39689. Allow same quoting for SSI attribute values as httpd.
markt [Sat, 22 Jul 2006 21:48:51 +0000 (21:48 +0000)]
Port fix bug 39689. Allow same quoting for SSI attribute values as httpd.

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

19 years agoPort partial fix for 34801
markt [Sat, 22 Jul 2006 00:19:59 +0000 (00:19 +0000)]
Port partial fix for 34801

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

19 years agoRemove old APR references
fhanik [Fri, 21 Jul 2006 20:15:35 +0000 (20:15 +0000)]
Remove old APR references

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

19 years agoMake sure the key is valid before processing it
fhanik [Fri, 21 Jul 2006 19:30:31 +0000 (19:30 +0000)]
Make sure the key is valid before processing it

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

19 years agoDereference socket after its been used
fhanik [Fri, 21 Jul 2006 16:27:42 +0000 (16:27 +0000)]
Dereference socket after its been used

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

19 years agoAdd eol-style property for non-common extensions
mturk [Fri, 21 Jul 2006 06:22:30 +0000 (06:22 +0000)]
Add eol-style property for non-common extensions
that were not set by script.

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

19 years agoAdd missing executable properties.
mturk [Fri, 21 Jul 2006 06:17:16 +0000 (06:17 +0000)]
Add missing executable properties.
This time without lock/unlock.

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

19 years ago- Changes to session id parsing so that it is done (as well as ";" path parameter...
remm [Thu, 20 Jul 2006 16:01:41 +0000 (16:01 +0000)]
- Changes to session id parsing so that it is done (as well as ";" path parameter stripping) before
  decoding, making it possible to %xx encode ";" in the URL.
- This can probably be backported to 5.5.x.

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

19 years agoPhase 1: Setting eol and mime types
mturk [Thu, 20 Jul 2006 12:50:34 +0000 (12:50 +0000)]
Phase 1: Setting eol and mime types
@echo off
if "%OS%" == "Windows_NT" setlocal

if "%1" == "" (
set SCRIPT_NAME=%~f0
) else (
set SCRIPT_NAME=%~f1
)

for /D %%i in (*) do (
cd %%i
svn propset svn:eol-style native *.java
svn propset svn:eol-style native *.properties
svn propset svn:eol-style native *.xml
svn propset svn:eol-style native *.xsd
svn propset svn:eol-style native *.xsl
svn propset svn:eol-style native *.dtd
svn propset svn:eol-style native *.tld
svn propset svn:eol-style native *.html
svn propset svn:eol-style native *.txt
svn propset svn:eol-style native *.jsp
svn propset svn:eol-style native *.jspx
svn propset svn:eol-style native *.jspf
svn propset svn:eol-style native *.sh
svn propset svn:eol-style native *.bat
svn propset svn:eol-style native *.svg
svn propset svn:mime-type image/gif *.gif
svn propset svn:mime-type image/jpeg *.jpg
svn propset svn:mime-type image/bmp *.bmp
svn propset svn:mime-type application/pdf *.pdf
svn propset svn:mime-type application/pdf *.pdf
svn propset svn:mime-type image/x-icon *.ico

call %SCRIPT_NAME% %SCRIPT_NAME%
cd ..
)

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

19 years agoAdjusted comment
fhanik [Wed, 19 Jul 2006 18:03:23 +0000 (18:03 +0000)]
Adjusted comment

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

19 years agoComet connection handling. When the response.getWriter().close() method has been...
fhanik [Wed, 19 Jul 2006 17:49:47 +0000 (17:49 +0000)]
Comet connection handling. When the response.getWriter().close() method has been called,
the comet connection is setup for closure instead of waiting for a timeout.
This is necessary since the servlet could have set a long timeout.
Also, improve on timeout checking. Only use the optimization for how frequently we need to check the keys if there has been no activity on the selector. During heavy activity, the optimization takes into effect.

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

19 years agoThumbs.db is not part of the servlet spec
mturk [Wed, 19 Jul 2006 16:53:59 +0000 (16:53 +0000)]
Thumbs.db is not part of the servlet spec
I suppose. Seems someone committed that from the
Windows with folder image thumbnail cache.

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

19 years agoFixed chunked input filter to parse the header correctly. Performs strict parsing...
fhanik [Wed, 19 Jul 2006 13:00:42 +0000 (13:00 +0000)]
Fixed chunked input filter to parse the header correctly. Performs strict parsing according to the RFC2616, so if the header is invalid it bails out.

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

19 years ago- get/setProperty are used by IntrospectionUtils. Oops.
remm [Wed, 19 Jul 2006 07:05:45 +0000 (07:05 +0000)]
- get/setProperty are used by IntrospectionUtils. Oops.

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

19 years agoAdd svn:eol-style:native.
mturk [Tue, 18 Jul 2006 15:38:14 +0000 (15:38 +0000)]
Add svn:eol-style:native.
We'll probably need to do that for the entire repository.

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

19 years agoAdd svn:eol-style:native
mturk [Tue, 18 Jul 2006 15:16:38 +0000 (15:16 +0000)]
Add svn:eol-style:native

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

19 years agoWhile this change made my linux box go faster, I could constantly crash my windows...
fhanik [Fri, 14 Jul 2006 05:14:31 +0000 (05:14 +0000)]
While this change made my linux box go faster, I could constantly crash my windows VM, so it will have to wait

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

19 years agoTake advantage of Java 5 concurrent classes
fhanik [Fri, 14 Jul 2006 04:49:46 +0000 (04:49 +0000)]
Take advantage of Java 5 concurrent classes

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

19 years agoOptimize timeout handling, thanks to a suggestion from Jeanfrancois.Arcand@Sun.COM,
fhanik [Fri, 14 Jul 2006 03:27:06 +0000 (03:27 +0000)]
Optimize timeout handling, thanks to a suggestion from Jeanfrancois.Arcand@Sun.COM,
although this does put a gap in the timeout check, even in those cases where there shouldn't be, ie, a socket can be closed immediately

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

19 years agoSet a per connection timeout
fhanik [Thu, 13 Jul 2006 19:51:56 +0000 (19:51 +0000)]
Set a per connection timeout

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

19 years agoAdd optional comet timeout support
fhanik [Thu, 13 Jul 2006 15:12:56 +0000 (15:12 +0000)]
Add optional comet timeout support

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

19 years ago- Comment out storeconfig for now.
remm [Thu, 13 Jul 2006 14:00:17 +0000 (14:00 +0000)]
- Comment out storeconfig for now.
- Port patch.
- Add logging.properties.

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

19 years ago- Add the set of scripts.
remm [Thu, 13 Jul 2006 12:48:04 +0000 (12:48 +0000)]
- Add the set of scripts.

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

19 years ago- Add the set of scripts.
remm [Thu, 13 Jul 2006 12:46:40 +0000 (12:46 +0000)]
- Add the set of scripts.

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

19 years agoDelete unused classes deprecated in TC5.
markt [Thu, 13 Jul 2006 02:36:06 +0000 (02:36 +0000)]
Delete unused classes deprecated in TC5.

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

19 years agoPort CGI parameter and POST fixes from TC5
markt [Thu, 13 Jul 2006 02:12:34 +0000 (02:12 +0000)]
Port CGI parameter and POST fixes from TC5

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

19 years agoThe NIO connector uses only one poller, so the poller doesn't need to be comet or...
fhanik [Wed, 12 Jul 2006 23:29:52 +0000 (23:29 +0000)]
The NIO connector uses only one poller, so the poller doesn't need to be comet or non comet.
Instead the comet status is kept with the key/socket for future reference.
This can enable us to end the comet request on the server side in the future, yet maintain the keep alive.

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

19 years ago- Fix src packaging.
remm [Wed, 12 Jul 2006 21:39:49 +0000 (21:39 +0000)]
- Fix src packaging.

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

19 years ago- More release scripts work.
remm [Wed, 12 Jul 2006 17:18:35 +0000 (17:18 +0000)]
- More release scripts work.
- Note: webapps are not built yet (I think I will give up on precompilation, though, since the
  benefits are a bit small).

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

19 years ago40012 - Legacy EL Support not resolving variables correctly
funkman [Tue, 11 Jul 2006 17:51:14 +0000 (17:51 +0000)]
40012 - Legacy EL Support not resolving variables correctly

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

19 years agoRemove sendfile support, this is a native called, this will be a pure java connector
fhanik [Tue, 11 Jul 2006 14:57:16 +0000 (14:57 +0000)]
Remove sendfile support, this is a native called, this will be a pure java connector

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

19 years ago- Fix some obvious problems with the packaging.
remm [Tue, 11 Jul 2006 14:13:13 +0000 (14:13 +0000)]
- Fix some obvious problems with the packaging.

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

19 years agosince we are writing on a piggy back thread, better make it thread safe in case there...
fhanik [Mon, 10 Jul 2006 14:20:00 +0000 (14:20 +0000)]
since we are writing on a piggy back thread, better make it thread safe in case there are multiple backend threads writing (async or comet)

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

19 years agoAdd open office mime-types. Port of fix for bug 39865 from TC5.
markt [Sat, 8 Jul 2006 22:55:15 +0000 (22:55 +0000)]
Add open office mime-types. Port of fix for bug 39865 from TC5.

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

19 years ago- Should improve handling of the root logger (sorry, I don't know who submitted this...
remm [Fri, 7 Jul 2006 22:42:46 +0000 (22:42 +0000)]
- Should improve handling of the root logger (sorry, I don't know who submitted this, it was a while
  ago).

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

19 years ago- Add the base webapps and stuff, so they're there (not built yet).
remm [Fri, 7 Jul 2006 22:40:04 +0000 (22:40 +0000)]
- Add the base webapps and stuff, so they're there (not built yet).

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

19 years ago- Start work on a dist script (that I will keep separate to avoid having a bloated...
remm [Fri, 7 Jul 2006 22:37:03 +0000 (22:37 +0000)]
- Start work on a dist script (that I will keep separate to avoid having a bloated main script).

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

19 years ago- Remove the spare threads attributes.
remm [Fri, 7 Jul 2006 22:35:57 +0000 (22:35 +0000)]
- Remove the spare threads attributes.

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

19 years ago- If there is a security manager, the map should be reset (otherwise, references...
remm [Fri, 7 Jul 2006 22:35:25 +0000 (22:35 +0000)]
- If there is a security manager, the map should be reset (otherwise, references could be kept).

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

19 years ago- Update to JDT 3.2 (I think TC 5.5 should be updated too).
remm [Tue, 4 Jul 2006 15:43:28 +0000 (15:43 +0000)]
- Update to JDT 3.2 (I think TC 5.5 should be updated too).

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

19 years ago- Redo the session activity check (which prevents expiring a session if there is...
remm [Thu, 29 Jun 2006 11:37:30 +0000 (11:37 +0000)]
- Redo the session activity check (which prevents expiring a session if there is an extremely
  long request and a short timeout) as optional, and using an atomic integer.

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

19 years ago- As redoing the encoders and decoders won't happen immediately, save some memory...
remm [Tue, 27 Jun 2006 13:48:36 +0000 (13:48 +0000)]
- As redoing the encoders and decoders won't happen immediately, save some memory by cleaning the
  cache when starting a Comet request (which is supposed to last for a while).

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

19 years agoChange the compiler to the lastest version.
jfclere [Mon, 26 Jun 2006 18:25:51 +0000 (18:25 +0000)]
Change the compiler to the lastest version.

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

19 years ago- Catch everything, as any unexpected exception would kill the server.
remm [Mon, 26 Jun 2006 17:48:32 +0000 (17:48 +0000)]
- Catch everything, as any unexpected exception would kill the server.

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

19 years agoDont do the not needed operations, if they are not needed.
fhanik [Thu, 22 Jun 2006 22:02:23 +0000 (22:02 +0000)]
Dont do the not needed operations, if they are not needed.
Performance is just a tad under java.io, which is expected as we need to poll, as opposed to constantly wait for data.

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

19 years agoTwo fixes,
fhanik [Thu, 22 Jun 2006 20:28:27 +0000 (20:28 +0000)]
Two fixes,
process timeouts last, no need to check a timeout on a valid read. hence we do it after we process the actual operations
Throw an IO exception if we reach end of stream so that the sockets can get properly closed down
Speed is the same for nio and io right now, nio seems just a tad faster without keep alives

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

19 years agoCatch the cancelled key exceptions and act appropriately
fhanik [Thu, 22 Jun 2006 19:59:39 +0000 (19:59 +0000)]
Catch the cancelled key exceptions and act appropriately

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

19 years agoFix so that we don't do a busy read, instead we are properly doing a NIO poller wait
fhanik [Thu, 22 Jun 2006 19:05:02 +0000 (19:05 +0000)]
Fix so that we don't do a busy read, instead we are properly doing a NIO poller wait
This way, we can achieve blocking read, without wasting CPU cycles.
Since we are using Java 5, I will be changing this implementation from using synchronized to using the Exchanger, this is also to avoid anyi locks that can happen. For example, in the current implementation the poller can call notify before we have had a chance to call wait

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

19 years agomust come up with a better sleep, this brings the nio connector up to the same speed...
fhanik [Thu, 22 Jun 2006 17:09:14 +0000 (17:09 +0000)]
must come up with a better sleep, this brings the nio connector up to the same speed as the io connector however, there is a risk for cpu contention on slow clients, fix will be coming

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

19 years agoReverted last nights checkin, until I fix the line ending story, and this also makes...
fhanik [Thu, 22 Jun 2006 16:10:17 +0000 (16:10 +0000)]
Reverted last nights checkin, until I fix the line ending story, and this also makes the connector work again

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

19 years agoReverted checkin, we can use a fully qualified class name inside of the protocol
fhanik [Thu, 22 Jun 2006 16:03:32 +0000 (16:03 +0000)]
Reverted checkin, we can use a fully qualified class name inside of the protocol

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

19 years ago- Add new files.
remm [Thu, 22 Jun 2006 10:11:41 +0000 (10:11 +0000)]
- Add new files.

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

19 years agoKeep track of whether the socket is in use or not. The same can of course be done...
fhanik [Thu, 22 Jun 2006 01:45:58 +0000 (01:45 +0000)]
Keep track of whether the socket is in use or not. The same can of course be done using
key.interestOps() as a socket in use would not be returning OP_READ

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

19 years agoNon blocking polling information.
fhanik [Thu, 22 Jun 2006 00:48:53 +0000 (00:48 +0000)]
Non blocking polling information.
This implementation in pure Java NIO is almost a mimic of the APR implementation. It blocks on read and write, but has non blocking polling capabilities. Currently the read/write blocking is "busy" blocking, but I will see if I can simply configure blocking for the socket and if that would still allow the poller to work as expected.
This makes it a suitable connector for comet style protocols and where APR is not desired or available.

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

19 years ago- Fix annotation names.
remm [Wed, 21 Jun 2006 09:21:32 +0000 (09:21 +0000)]
- Fix annotation names.

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

19 years agoUpdate the modeler with the sandbox version, using dynamic mbeans instead of model...
costin [Tue, 20 Jun 2006 21:31:42 +0000 (21:31 +0000)]
Update the modeler with the sandbox version, using dynamic mbeans instead of model mbeans.

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

19 years agoAdd a quick comment.
costin [Tue, 20 Jun 2006 20:46:23 +0000 (20:46 +0000)]
Add a quick comment.

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

19 years agoDead code, nobody seems to be using it.
costin [Tue, 20 Jun 2006 20:45:36 +0000 (20:45 +0000)]
Dead code, nobody seems to be using it.

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

19 years agoDirect calls instead of introspection via JMX
costin [Tue, 20 Jun 2006 20:43:37 +0000 (20:43 +0000)]
Direct calls instead of introspection via JMX

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

19 years agoRemove JMX warning message since java5 is required
funkman [Tue, 20 Jun 2006 11:12:30 +0000 (11:12 +0000)]
Remove JMX warning message since java5 is required

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

19 years agoRevert, if Content-Length: <some large value> is an acceptable work around
fhanik [Sat, 17 Jun 2006 00:12:20 +0000 (00:12 +0000)]
Revert, if Content-Length: <some large value> is an acceptable work around

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

19 years agoFixed comet processing.
fhanik [Fri, 16 Jun 2006 20:55:06 +0000 (20:55 +0000)]
Fixed comet processing.
The following bug was existing:
When a comet request had begun, and the browser sent some more data, the Tomcat APR component was never reading the data from the socket and lead to two kinds of failures
1. The CometServlet.read returned false, cause no data was read, and the socket closed
2. If the CometServlet.read was overwritten and return true, the thread got stuck in a loop, forever hanging.

The solution was to read the incoming data from the socket, update the content length of the request, and make sure that the input filters would still allow to read the data.

I think the following features still need to be fixed:
1. If CometServlet.read return false, the adapter should call CometServlet.end, not CometServlet.error
2. If CometServlet.read throws an error, then the adapter should call CometServlet.error
3. When CometServlet.read returns false, don't close the socket, keep alive should still work and we should still be able to process more HTTP requests on that connection

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

19 years agoPort fix for bug 39769. Remove the classloader switching from unload. It was removed...
markt [Sun, 11 Jun 2006 21:53:53 +0000 (21:53 +0000)]
Port fix for bug 39769. Remove the classloader switching from unload. It was removed from load some time ago. Patch provided by David Gagnon.

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

19 years agoPort fix for bug 39752 from 5.5.x.
markt [Fri, 9 Jun 2006 23:09:40 +0000 (23:09 +0000)]
Port fix for bug 39752 from 5.5.x.

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

19 years agoSet line endings to native
markt [Fri, 9 Jun 2006 23:06:52 +0000 (23:06 +0000)]
Set line endings to native

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

19 years ago- Add the manager classes and a package renamed fileupload.
remm [Thu, 8 Jun 2006 15:35:56 +0000 (15:35 +0000)]
- Add the manager classes and a package renamed fileupload.
- I think there should be basic multipart handling in the core, although maybe the manager doesn't
  belong here (so I would remove it later on).

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

19 years ago- While it wouldn't be a completely bad idea to switch to an executor, the black...
remm [Thu, 8 Jun 2006 15:00:12 +0000 (15:00 +0000)]
- While it wouldn't be a completely bad idea to switch to an executor, the black box behavior of an
  executor makes it a bit bad to be used with a default lame implementation, while the fancy
  implementations are more "big server" ready with far more overhead and complexity.

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

19 years ago- Create clustered managers with the Catalina CL set as the context CL (as classloadi...
remm [Thu, 8 Jun 2006 14:50:07 +0000 (14:50 +0000)]
- Create clustered managers with the Catalina CL set as the context CL (as classloading may occur).
- Should fix 39699.

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

19 years agoAdd missing method to stop Gump from nagging
billbarker [Thu, 8 Jun 2006 05:06:37 +0000 (05:06 +0000)]
Add missing method to stop Gump from nagging

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

19 years ago- Remove usage of the CharChunk buffer (converters already use buffers). C2B converte...
remm [Sun, 4 Jun 2006 15:05:19 +0000 (15:05 +0000)]
- Remove usage of the CharChunk buffer (converters already use buffers). C2B converters could most
  likely be optimized (since they should probably rely on the byte chunk that they are writing to).
  This does not seem to reduce performance in a noticeable way, but I did not benchmark that much.

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

19 years ago- With Comet support, it is necessary to optimize the amount of memory used by individual
remm [Sun, 4 Jun 2006 15:01:39 +0000 (15:01 +0000)]
- With Comet support, it is necessary to optimize the amount of memory used by individual
  processors. This removes most of the buffers that are being used, without reducing performance
  in many cases.
- Note: I'm not sure the algorithm in InternalAprInputBuffer.nextRequest, which is used when
  pipelining, is correct. It also could use free space in the buffer more efficiently when trimming
  it.

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

19 years ago- Add a brain dead executor.
remm [Tue, 30 May 2006 09:58:41 +0000 (09:58 +0000)]
- Add a brain dead executor.
- Submitted by Vincenc Beltran Querol.

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

19 years ago- Port root webapp.
remm [Mon, 29 May 2006 16:17:01 +0000 (16:17 +0000)]
- Port root webapp.

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

19 years ago- Add trivial exclude.
remm [Mon, 29 May 2006 16:02:14 +0000 (16:02 +0000)]
- Add trivial exclude.

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

19 years ago- I had some problems when shutting down pollers which had active connections in...
remm [Mon, 29 May 2006 14:09:13 +0000 (14:09 +0000)]
- I had some problems when shutting down pollers which had active connections in them. I can't
  reproduce any problem anymore, unfortunately, but I think it was because there was a poll going
  on while the sockets in the poller were being destroyed, which could then lead to these sockets
  being destroyed again. So I'm adding code to wait until the poll call is done before doing the
  poller stop.

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

19 years ago- Add examples webapp.
remm [Mon, 29 May 2006 11:51:34 +0000 (11:51 +0000)]
- Add examples webapp.
- New chat example, which doesn't work properly yet (I suck at HTML). For some reason, it works with
  a telnet, but not with a browser, which doesn't do any rendering until the whole page is received.

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

19 years ago- Some small comet fixes.
remm [Fri, 26 May 2006 16:39:08 +0000 (16:39 +0000)]
- Some small comet fixes.

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

19 years ago- Fix some bugs with annotation support.
remm [Fri, 26 May 2006 16:38:24 +0000 (16:38 +0000)]
- Fix some bugs with annotation support.

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

19 years agoPort the fix for MODELER-3 from [modeler] (minus some of the fluff :).
billbarker [Thu, 25 May 2006 04:07:25 +0000 (04:07 +0000)]
Port the fix for MODELER-3 from [modeler] (minus some of the fluff :).

It's mostly non-critical path stuff, so it shouldn't be that much of a performance hit.

Also throw in some Generics cleanups.

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

19 years agoPort RMI fix from 5.5
billbarker [Wed, 24 May 2006 05:04:20 +0000 (05:04 +0000)]
Port RMI fix from 5.5

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

19 years ago- Use getDeclaredMethods/Fields here.
remm [Mon, 22 May 2006 23:37:24 +0000 (23:37 +0000)]
- Use getDeclaredMethods/Fields here.

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

19 years ago- Fix cut & paste bug, submitted by Stan Silvert.
remm [Sat, 20 May 2006 00:04:55 +0000 (00:04 +0000)]
- Fix cut & paste bug, submitted by Stan Silvert.

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

19 years ago- Some javadoc.
remm [Sat, 20 May 2006 00:04:08 +0000 (00:04 +0000)]
- Some javadoc.

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

19 years agoSuppress deprecation warnings on the implementation classes.
billbarker [Fri, 19 May 2006 07:33:35 +0000 (07:33 +0000)]
Suppress deprecation warnings on the implementation classes.

Sun's brain-dead compiler seems to require that I put these at Class level instead of method level.  I'm more than happy to change it if they ever manage to pull their collective heads out of their collective a**s.

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

19 years agoAFAIK mod_jk2 is deprecated - and I doubt anyone is using this. If they do - can be
costin [Fri, 19 May 2006 00:57:15 +0000 (00:57 +0000)]
AFAIK mod_jk2 is deprecated - and I doubt anyone is using this. If they do - can be
reverted.

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

19 years agoDowngrade to DynamicMBeans in method signatures - there is no need to use Model here,
costin [Fri, 19 May 2006 00:56:28 +0000 (00:56 +0000)]
Downgrade to DynamicMBeans in method signatures - there is no need to use Model here,
the mbean server doesn't care.

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

19 years ago- Add example read method.
remm [Fri, 19 May 2006 00:44:04 +0000 (00:44 +0000)]
- Add example read method.
- Return value for read errors (as an option compared with throwing an exception).
- Add some javadocs.

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

19 years ago- Ok, it seems to work at least a little bit (hopefully, nobody tried it before this...
remm [Thu, 18 May 2006 18:29:07 +0000 (18:29 +0000)]
- Ok, it seems to work at least a little bit (hopefully, nobody tried it before this). Overall, the
  changes are fairly limited.
- In the end, I prefer adding a new method in Adapter, although it is easy to change back.
- I'll try to add the examples webapp back, and add the obligatory chat servlet (so lame ...).

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

19 years ago- Start work on comet support. Note: it doesn't work yet, I think (I didn't test...
remm [Wed, 17 May 2006 12:55:39 +0000 (12:55 +0000)]
- Start work on comet support. Note: it doesn't work yet, I think (I didn't test), and most of this
  is very preliminary. It is relatively straightforward, though.

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

19 years ago- Use Integer.valueOf.
remm [Wed, 17 May 2006 12:51:41 +0000 (12:51 +0000)]
- Use Integer.valueOf.
- Update restricted list a bit.

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

19 years agoUse APR_UNSPEC for IPv6 and address=null. Backport from 5.5 branch.
mturk [Wed, 17 May 2006 06:33:41 +0000 (06:33 +0000)]
Use APR_UNSPEC for IPv6 and address=null. Backport from 5.5 branch.

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

19 years agoUse APR_UNSPEC only if the provided address
mturk [Tue, 16 May 2006 07:14:46 +0000 (07:14 +0000)]
Use APR_UNSPEC only if the provided address
actually is the IPV6 address.

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

19 years ago- Use the ignore annotation flag.
remm [Tue, 9 May 2006 14:05:23 +0000 (14:05 +0000)]
- Use the ignore annotation flag.
- It needs recompilation in case the value is changed. It could do without, but would need
  additional code in the generated servlets (a field, read a servlet context param), so
  it would generally be (even) more intrusive :(

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

19 years ago- Pass the ignore annotation flag to Jasper.
remm [Tue, 9 May 2006 14:02:01 +0000 (14:02 +0000)]
- Pass the ignore annotation flag to Jasper.

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