a0dae20ac0
jetty-9 \o/ first suspend resume cycles on jetty-9
2012-05-25 11:33:04 +02:00
ae65cf6b5e
Merge branch 'master' into jetty-8
2012-05-24 15:12:15 -05:00
0789690cea
jetty-9 horrid hack to make onClose events work
2012-05-24 22:00:45 +02:00
c7979d399a
379046 idle close dispatched to own thread and deregistered from further idle calls
2012-05-24 21:57:30 +02:00
cf214ffeef
Merge branch 'master' into jetty-8
2012-05-24 08:35:22 -05:00
d80be96e41
379046 avoid closing idle connections from selector thread
2012-05-24 13:20:44 +02:00
4473572b6d
jetty-9 more progress with RFC2616 tests
2012-05-23 18:04:50 +02:00
40ed3a013a
jetty-9 some progress on HTTP error handling but more work needed. See SelectChannelServerTest
2012-05-18 13:12:38 +02:00
6502370426
jetty-9 continue clean up of HttpConnector. Removed idle check
2012-05-17 14:14:56 +02:00
68f8e073db
jetty-9 progress on unit tests and LocalConnector
2012-05-14 19:58:09 +02:00
fcfb5d704a
jetty-9 AsyncByteArrayEndPoint test
2012-05-14 10:58:45 +02:00
4b8f6b8413
jetty-9 SelectorManager refactorings.
2012-05-11 19:30:30 +02:00
9e8b2f1aad
SSL refactorings.
2012-05-11 10:19:47 +02:00
7f291e8831
jetty-9 AsyncByteArrayEndPointTest
2012-05-11 00:30:45 +02:00
bd00e3615d
jetty-9 AsyncByteArrayEndPointTest
2012-05-11 00:30:28 +02:00
6d70fa1c2a
jetty-9 factored out WriteFlusher and ReadInterest
2012-05-10 16:53:56 +02:00
e348f2d4f5
jetty-9 progress on jetty-server
2012-05-10 12:19:16 +02:00
979dae0021
jetty-9 moved FutureCallback to jetty-util
2012-05-09 18:27:09 +02:00
817b9ee5fa
jetty-9 everything but SSL working again
2012-05-09 17:02:38 +02:00
4caced258f
jetty-9 removed IOFuture and added FutureCallback instead
2012-05-09 16:57:18 +02:00
775376ac98
jetty-9 refactored stats
2012-05-09 14:34:10 +02:00
a7154fcb05
jetty-9 work in progress
2012-05-09 13:30:27 +02:00
2b9ff87e02
Merge branch 'jetty-9' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-9
...
Conflicts:
jetty-io/src/main/java/org/eclipse/jetty/io/AsyncConnection.java
2012-05-09 11:19:52 +02:00
c1011c54a4
jetty-9 work in progress
2012-05-09 11:18:20 +02:00
44d2735a21
Changes to jetty-io related to integration with jetty-spdy.
2012-05-09 11:15:07 +02:00
0c81b36e04
jetty-9 work in progress on jetty-server
2012-05-09 08:30:09 +02:00
fa59ddcc4b
jetty-9 switched back to normal synchronization
2012-05-08 20:09:02 +02:00
bc7e42e31f
jetty-9 more robust test
2012-05-08 19:44:35 +02:00
3c066d7a58
Fixed merging issues.
2012-05-08 19:00:40 +02:00
2b26d2f3ee
Refactorings.
2012-05-08 19:00:40 +02:00
98e85ecb41
jetty-9 EndPoint.close does not throw
2012-05-08 15:46:41 +02:00
6d64bcd38a
jetty-9 more removal of AsyncConnection
2012-05-08 15:30:32 +02:00
dc02390449
jetty-9 some findbug cleanups
2012-05-08 14:09:50 +02:00
7e8a627b92
jetty-9 removed AsyncConnection interface
2012-05-08 14:02:32 +02:00
2131a40559
Merge remote-tracking branch 'origin/master' into jetty-8
2012-05-07 13:54:30 +02:00
2b78e69ac9
jetty-9 work in progress
2012-05-07 13:37:23 +02:00
6cefe6c8f7
jetty-9 do not recycle IOFutures
2012-05-04 21:41:27 +02:00
9a5f86188e
jetty-9 slow progress on SSL robustness
2012-05-04 19:10:24 +02:00
6e62ab9bbe
jetty-9 slow progress on SSL robustness
2012-05-04 17:59:32 +02:00
ad108c42c9
jetty-9 refactored common IOFuture pattern
2012-05-04 08:52:27 +02:00
a1d8c640ce
jetty-9 removed onInputShutdown
2012-05-03 22:11:58 +02:00
017d6e7c2a
jetty-9 cleanups
2012-05-03 21:41:54 +02:00
f0eded5fdb
jetty-9 tests for ByteArrayEndPoint
2012-05-03 18:07:53 +02:00
5e18ff7278
jetty-9 working on ByteArrayEndPoint
2012-05-03 15:17:34 +02:00
60f9d7faff
jetty-9 working on ByteArrayEndPoint
2012-05-03 15:17:23 +02:00
6a5fdefa07
jetty-9 added IOFuture test
2012-05-03 09:52:56 +02:00
8f8c3f7760
jetty-9 ssl tests pass
2012-05-03 07:48:01 +02:00
ba4157d8e6
jetty-9 more ssl progress.
2012-05-03 07:29:22 +02:00
c61497327a
jetty-9 new jetty-io NIO.2 inspired design, mostly working but more work needed on SSL
2012-05-02 17:22:55 +02:00
011ae1f447
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
...
Change-Id: I8a8a3d57cba7a9c3502d1b6af6ff6eb5ac4e4ef5
377587: UnitTest for ConnectHandler.write() with partial writes and non full buffer.
Change-Id: I8d104d54de55e22325d14e69b474b245fe9d126c
2012-04-27 11:13:44 +02:00
c7f25b0928
jetty-9 work in progress
2012-04-26 10:03:21 +10:00
5e83df20c8
various sonar/findbug code cleanups
2012-04-25 00:00:54 +10:00
b5e9de1cd8
Merge remote-tracking branch 'origin/master' into jetty-8
2012-04-12 17:16:22 +10:00
a565c72adb
374550: remove printStackTrace calls
2012-04-12 16:51:59 +10:00
737db225e3
jetty-9 progress on SslConnection tests
2012-04-05 23:17:30 +10:00
e7dcd16757
jetty-9 Simplified interface
2012-04-04 14:00:16 +10:00
dfab993fcb
jetty-9 SSL partially working
2012-04-04 13:47:46 +10:00
17269583fb
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-30 12:05:46 +11:00
c60ec9cf5f
jetty-9: work in progress on read/write interest
2012-03-29 22:49:08 +11:00
b267511f8f
jetty-9 sketched out httpchannel blocking read
2012-03-28 23:31:39 +11:00
2bcf611e5e
jetty-9 work in progress. Further simplification of jetty-io
2012-03-27 00:19:43 +11:00
e77f4344ac
jetty-9 work in progress on HttpConnection to HttpChannel split
2012-03-23 16:29:38 +11:00
65725b0025
357318: make the cancel key work around conditional on running on windows
2012-03-23 09:21:00 +11:00
d8b1d80e4e
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
jetty-spdy/spdy-jetty-http-webapp/pom.xml
jetty-spdy/spdy-jetty-http/pom.xml
jetty-spdy/spdy-jetty/pom.xml
2012-03-19 17:22:02 +11:00
7e3b8bcfd4
374611: do not redispatch if already dispatched when SSL reads content on write
2012-03-19 15:48:39 +11:00
7842e9c101
374450: use temp read only buffers instead of synchronisation
2012-03-16 10:05:38 +11:00
a6eda90594
fixed merge issue
2012-03-16 09:16:46 +11:00
fef74963af
Forgotten modifications from Jetty7
2012-03-14 19:39:21 +01:00
5624a5721e
Merged from master.
2012-03-14 18:24:57 +01:00
2e2247bde5
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2012-03-14 16:32:03 +01:00
4a02fdb6c0
374252 - SslConnection.onClose() does not forward to nested connection.
2012-03-14 16:12:46 +01:00
708f8ccaeb
374158: do not asyncDispatch from SSL if suspended
2012-03-14 11:48:06 +11:00
10cc4ca498
jetty-9 refactored jetty-http to support injected state
2012-03-13 13:35:48 +11:00
03525bfe46
jetty-9 javadoc and code cleanups
2012-03-08 15:18:17 +11:00
381615f52d
merge from master
2012-03-07 16:44:31 -06:00
ff75d9e38a
373394: fix for IllegalArgumentException in SelectChannelEndpoint.blockWritable() when wait is called with a negative value.
2012-03-06 21:26:46 +01:00
ffdcfa5dde
Avoid reading field twice (may lead to spurious NPEs).
2012-03-06 18:09:58 +01:00
54493cd80d
Merge "373246: IOTest.testReset uses dynamic port now instead of static hard coded one"
2012-03-05 09:18:08 -05:00
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
a4bee5b12d
jetty-9 work in progress on new HttpGenerator
2012-03-02 11:39:42 +11:00
959a4a2743
Merge remote-tracking branch 'origin/master' into jetty-8
2012-03-02 10:39:17 +11:00
79ce93ba94
357318: cancel key before close as speculative work around for JVM bug
2012-03-02 08:07:16 +11:00
c7b42cdb06
Merge remote-tracking branch 'origin/master' into jetty-8
2012-02-29 20:07:33 +11:00
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
9c1d3ff0b3
jetty-9 temporary tree map impl
2012-02-09 18:02:51 +11:00
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
7ba514e250
jetty-9 fixed SSL issue. _inbound needed to be compacted
2012-02-07 15:27:15 +11:00
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
6b079ae3d8
merge from master
2012-02-01 17:25:08 -06:00
2197854308
369121 simplified test
2012-01-31 15:35:35 +11:00
c918bb4e3c
Merge branch 'master' into jetty-8
2012-01-25 10:31:44 -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
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
3e05c1e59d
Merged from origin/master.
2011-12-16 21:30:45 +01:00
ed1ee997b4
Fixed missing call to handle() in case of non-dispatched reads.
...
While performing a SSL write triggered by an application thread that is not
dispatched by the NIO layer, process() may read and decrypt bytes that will
be kept in the _unwrapBuf buffer.
However, the application needs to parse these bytes, but parsing is normally
performed only from handle() by a thread dispatched by the NIO layer.
The fix is to detect if there are unparsed bytes at the end of process(), and if
so, call asyncDispatch() to eventually call handle() to parse those bytes.
2011-12-16 20:58:18 +01:00
a88e2c5ebb
Updated toString() implementations.
2011-12-16 20:53:15 +01:00
e515b5b7dc
JETTY-1460 suppress PrintWriter exceptions
2011-12-15 20:19:04 +11:00
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
fa0e06d186
Removed guard whether the channel is closed in checkIdleTimestamp().
...
This follows commit ff29a1cc51
2011-12-13 11:14:25 +01:00
416b6a8a15
Added guard against multiple closes: if the endPoint is already closed, skip updating the SSLEngine and/or the endPoint.
2011-12-12 16:57:14 +01:00
de005c68fd
Revert "Merge branch 'release-8'"
...
This reverts commit 9e72457941df12605f0e
2011-11-30 16:27:30 +11:00
dcf7ef2335
fixes after merge
2011-11-29 10:15:20 +11:00
55d5020980
Merge remote-tracking branch 'origin/master' into jetty-8
...
Conflicts:
VERSION.txt
jetty-server/src/main/java/org/eclipse/jetty/server/AbstractHttpConnection.java
jetty-server/src/main/java/org/eclipse/jetty/server/Response.java
jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletHandler.java
2011-11-29 09:06:25 +11:00
4ce72ee549
improved test timing
2011-11-29 08:36:56 +11:00
b969de1788
organized imports
2011-11-28 15:32:14 +11:00
06b66f31f5
test NIO assumptions
2011-11-28 11:54:08 +11:00
ddce35a2e6
364638 SCEP does idle timestamp checking. New setCheckForIdle method controls onIdleExpired callback.
...
364921 a second onIdleExpired callback will result in close rather than a shutdown output.
2011-11-28 11:51:01 +11:00
8e913fe7c0
Fixed bug in AsyncEndPoint.hasProgressed() handling: the progressing status
...
must be remembered until a call to hasProgressed() is made.
Additional code cleanups.
2011-11-24 20:58:59 +01:00
c6103f2d53
Removed usages of ThreadDeath.
2011-11-24 20:39:04 +01:00
59c111bde1
Rewritten toString() methods using String.format().
2011-11-24 15:20:06 +01:00
8f1fff78c0
Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format().
2011-11-24 10:16:19 +01:00
aa0b71f928
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-11-22 13:16:40 +11:00
6cb2d13abd
Client idle connection uses onIdleExpired rather than close
2011-11-22 12:57:32 +11:00
e1d05939b8
Merge remote-tracking branch 'origin/master'
2011-11-21 23:47:03 +01:00
83f2c1b55c
Integrated behavior of is[In|Out]putShutdown() with volatile flag and previous implementation.
2011-11-21 23:31:09 +01:00
e27c5a9306
Normalized behavior of shutdown[In|Out]put() methods and is[In|Out]putShutdown(), relying on a volatile flag.
2011-11-21 21:39:47 +01:00
d55477388b
more debug in tests
2011-11-22 00:12:56 +11:00
Greg Wilkins
Jesse McConnell
Simone Bordet
Jan Bartel
Thomas Becker
Greg Wilkins
Jan Bartel