6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
2197854308
369121 simplified test
2012-01-31 15:35:35 +11:00
6e44f4db5f
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:15:45 -06:00
9d1ca3593e
[maven-release-plugin] prepare release jetty-8.1.0.v20120127
2012-01-27 08:15:38 -06:00
ad6126553b
[maven-release-plugin] prepare for next development iteration
2012-01-27 08:13:06 -06:00
4e25f7bb05
[maven-release-plugin] prepare release jetty-7.6.0.v20120127
2012-01-27 08:13:00 -06:00
f2d0fd3cc8
revert back to 8.1.0-SNAPSHOT
2012-01-26 10:45:06 -06:00
7ac9eb585f
revert back to 7.6.0-SNAPSHOT
2012-01-26 10:42:11 -06:00
e98ae91ca6
[maven-release-plugin] prepare for next development iteration
2012-01-25 11:16:11 -06:00
fb30166a7f
[maven-release-plugin] prepare release jetty-8.1.0.v20120125
2012-01-25 11:16:05 -06:00
c918bb4e3c
Merge branch 'master' into jetty-8
2012-01-25 10:31:44 -06:00
0c96fc40ea
[maven-release-plugin] prepare for next development iteration
2012-01-25 09:31:06 -06:00
b455b7d94e
[maven-release-plugin] prepare release jetty-7.6.0.v20120125
2012-01-25 09:30:55 -06:00
f3735fab7b
368992 avoid update key while flushing during a write
2012-01-24 18:27:59 +11:00
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
02d53f9612
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-20 12:40:58 +11:00
8e69edaf9e
368992 avoid non-blocking flush when writing to avoid setting !_writable without _writeblocked
2012-01-20 12:40:34 +11:00
4fe85c9c1e
additional more informative test error messages
2012-01-19 13:42:07 -06:00
8e262aca04
[369120] more descriptive test failure output
2012-01-19 11:26:17 -06:00
7cd887d48b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-19 12:40:07 +11:00
f79bdfaf2e
368992 clear interest ops for double dispatch even if no read/write blocked threads
2012-01-19 12:39:45 +11:00
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
f039d00910
Made SslConnection logger a per-instance variable, to avoid lock contention with other SslConnection instances.
2012-01-18 10:05:35 +01:00
98684397fd
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-18 14:17:41 +11:00
9ff8633554
368821 SslConnection.handle always calls wrapped Connection.handle, so state can be processed
2012-01-18 13:39:24 +11:00
b57bf3b600
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-01-17 23:06:46 +01:00
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
90184ab3c3
Latest merge from master
2012-01-17 13:36:44 -06:00
1537433b81
368821 Only do SSL asyncDispatch for temp buffer fills
2012-01-17 23:59:12 +11:00
ef9ac7760d
368635 moved lifecycle state reporting from toString to dump
2012-01-16 15:24:31 +11:00
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
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
5c059550a8
Improved logging.
2012-01-11 22:18:24 +01:00
691efcc7ca
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-11 16:35:57 +11:00
bb0a320102
Improved toString().
2012-01-10 17:41:32 +01:00
8fcc22df32
368240: Improved handling of dispatch failure
2012-01-11 01:12:36 +11:00
a7783ae568
368240: Fixed the start of dependent beans
2012-01-11 01:04:01 +11:00
968a2ac95b
368240: Added concept of join to AggregateLifeCycle. Used by HttpClient and AbstractConnector
2012-01-11 00:09:34 +11:00
1fbec51c8a
Merge remote-tracking branch 'origin/master' into jetty-8
2012-01-10 16:08:59 +11:00
0fa4fa9b23
clean up some warnings from maven
2012-01-09 14:57:21 -06:00
bb2d782f3e
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-23 02:09:20 +11:00
b4ab738ca9
364921 Made test less time sensitive for ssl
2011-12-23 00:57:26 +11:00
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
7b2a0cb502
364921 removed debug
2011-12-22 00:53:33 +11:00
b99e03c465
364921 moved setCheckForIdle handling to AsyncHttpConnection
2011-12-22 00:48:25 +11:00
c3643d9937
Merge remote-tracking branch 'origin/master' into jetty-8
2011-12-21 12:37:23 +11:00
a606529710
364921 SslConnection does real close on idle if already oshut
2011-12-21 10:06:55 +11:00
ecb88f836e
367175 - SSL 100% CPU spin in case of blocked write and RST.
2011-12-20 13:25:55 +01:00
c5c6377e26
some IOTests to show that clients can write after server close???
2011-12-20 09:21:18 +11:00
b027779830
364638 check for idle after shutdown output
2011-12-19 16:53:14 +11:00
Jesse McConnell
Greg Wilkins
Simone Bordet
Jan Bartel