Jesse McConnell
381615f52d
merge from master
2012-03-07 16:44:31 -06:00
Thomas Becker
ff75d9e38a
373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value.
2012-03-06 21:26:46 +01:00
Simone Bordet
ffdcfa5dde
Avoid reading field twice (may lead to spurious NPEs).
2012-03-06 18:09:58 +01:00
Jesse McConnell
54493cd80d
Merge "373246: IOTest.testReset uses dynamic port now instead of static hard coded one"
2012-03-05 09:18:08 -05:00
Thomas Becker
0adec36c29
373246: IOTest.testReset uses dynamic port now instead of static hard coded one
...
Change-Id: I9b254937fa02ba745832bf1b5c99069bea641bbd
2012-03-05 15:15:23 +01:00
Greg Wilkins
a4bee5b12d
jetty-9 work in progress on new HttpGenerator
2012-03-02 11:39:42 +11:00
Jan Bartel
959a4a2743
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-02 10:39:17 +11:00
Greg Wilkins
79ce93ba94
357318: cancel key before close as speculative work around for JVM bug
2012-03-02 08:07:16 +11:00
Jan Bartel
c7b42cdb06
Merge remote-tracking branch 'origin/master' into jetty-8
2012-02-29 20:07:33 +11:00
Simone Bordet
556ff1a2c6
372457 - Big response + slow clients + pipelined requests cause Jetty spinning and eventually closing connections.
...
Added a TODO for a method renaming that will happen in the next major release (to avoid break implementers).
2012-02-28 09:21:52 +01:00
Greg Wilkins
9c1d3ff0b3
jetty-9 temporary tree map impl
2012-02-09 18:02:51 +11:00
Greg Wilkins
60bb4a415e
jetty-9 used enums instead of cached strings. Refactor of parser in progress to IO independent style. passes 1 test
2012-02-09 01:37:03 +11:00
Greg Wilkins
7ba514e250
jetty-9 fixed SSL issue. _inbound needed to be compacted
2012-02-07 15:27:15 +11:00
Greg Wilkins
c1bcec61d5
jetty-9 jetty-io mostly working with all NIO buffers. Occassional failure in SSL stress test
2012-02-07 11:32:00 +11:00
Jesse McConnell
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
Greg Wilkins
2197854308
369121 simplified test
2012-01-31 15:35:35 +11:00
Jesse McConnell
c918bb4e3c
Merge branch 'master' into jetty-8
2012-01-25 10:31:44 -06:00
Greg Wilkins
f3735fab7b
368992 avoid update key while flushing during a write
2012-01-24 18:27:59 +11:00
Greg Wilkins
e1b12a633b
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-distribution/pom.xml
jetty-osgi/test-jetty-osgi/pom.xml
2012-01-20 13:00:32 +11:00
Greg Wilkins
02d53f9612
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-20 12:40:58 +11:00
Greg Wilkins
8e69edaf9e
368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked
2012-01-20 12:40:34 +11:00
Jesse McConnell
4fe85c9c1e
additional more informative test error messages
2012-01-19 13:42:07 -06:00
Jesse McConnell
8e262aca04
[369120] more descriptive test failure output
2012-01-19 11:26:17 -06:00
Greg Wilkins
7cd887d48b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-19 12:40:07 +11:00
Greg Wilkins
f79bdfaf2e
368992 clear interest ops for double dispatch even if no read/write blocked threads
2012-01-19 12:39:45 +11:00
Simone Bordet
486af62635
Improved logging of exceptions; now stack traces are printed in debug mode, if the exception is rethrown.
2012-01-18 12:38:28 +01:00
Simone Bordet
f039d00910
Made SslConnection logger a per-instance variable, to avoid lock contention with other SslConnection instances.
2012-01-18 10:05:35 +01:00
Jan Bartel
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
Greg Wilkins
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
Simone Bordet
b57bf3b600
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-17 23:06:46 +01:00
Simone Bordet
6e38a97d7f
When dumping the selector, we should take the keys only once, otherwise the set of keys may change between calls.
2012-01-17 23:00:34 +01:00
Jesse McConnell
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
Greg Wilkins
1537433b81
368821 Only do SSL asyncDispatch for temp buffer fills
2012-01-17 23:59:12 +11:00
Greg Wilkins
ef9ac7760d
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:24:31 +11:00
Greg Wilkins
b8e0258faf
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/test/java/org/eclipse/jetty/server/SelectChannelTimeoutTest.java
2012-01-12 11:01:03 +11:00
Simone Bordet
d4f522b9d4
Corrected SslConnection to clear the _inbound buffer if the input is shutdown
...
and the unwrapping yielded a buffer underflow.
This is important because isInputShutdown() returns true only if the _inbound
buffer is empty, and the check for the input shutdown is made in several places.
Added also more SSL bytes tests that send RST in order to test cases that throw
exceptions.
2012-01-11 22:22:42 +01:00
Simone Bordet
5c059550a8
Improved logging.
2012-01-11 22:18:24 +01:00
Jan Bartel
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
Simone Bordet
bb0a320102
Improved toString().
2012-01-10 17:41:32 +01:00
Greg Wilkins
8fcc22df32
368240: Improved handling of dispatch failure
2012-01-11 01:12:36 +11:00
Greg Wilkins
a7783ae568
368240: Fixed the start of dependent beans
2012-01-11 01:04:01 +11:00
Greg Wilkins
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
Greg Wilkins
bb2d782f3e
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-23 02:09:20 +11:00
Greg Wilkins
b4ab738ca9
364921 Made test less time sensitive for ssl
2011-12-23 00:57:26 +11:00
Greg Wilkins
b36425b7aa
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-server/src/main/java/org/eclipse/jetty/server/handler/ContextHandler.java
2011-12-22 09:52:11 +11:00
Greg Wilkins
7b2a0cb502
364921 removed debug
2011-12-22 00:53:33 +11:00
Greg Wilkins
b99e03c465
364921 moved setCheckForIdle handling to AsyncHttpConnection
2011-12-22 00:48:25 +11:00
Jan Bartel
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
Greg Wilkins
a606529710
364921 SslConnection does real close on idle if already oshut
2011-12-21 10:06:55 +11:00
Simone Bordet
ecb88f836e
367175 - SSL 100% CPU spin in case of blocked write and RST.
2011-12-20 13:25:55 +01:00
