Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,298 Commits 67 Branches 465 Tags 359 MiB
Commit Graph

629 Commits

Author SHA1 Message Date
Simone Bordet 72040202d4 Reverted release back to 8.1.3-SNAPSHOT. 2012-04-13 17:27:37 +02:00
Simone Bordet 85710fb9ea Reverted release back to 7.6.3-SNAPSHOT. 2012-04-13 16:59:06 +02:00
Jesse McConnell 3b87e91cbe [maven-release-plugin] prepare for next development iteration 2012-04-12 10:29:30 -05:00
Jesse McConnell 308b010744 [maven-release-plugin] prepare release jetty-8.1.3.v20120412 2012-04-12 10:29:20 -05:00
Jesse McConnell cdcc0922c3 [maven-release-plugin] prepare for next development iteration 2012-04-12 09:49:52 -05:00
Jesse McConnell 5966c86571 [maven-release-plugin] prepare release jetty-7.6.3.v20120412 2012-04-12 09:49:46 -05:00
Greg Wilkins b5e9de1cd8 Merge remote-tracking branch 'origin/master' into jetty-8 2012-04-12 17:16:22 +10:00
Greg Wilkins a565c72adb 374550: remove printStackTrace calls 2012-04-12 16:51:59 +10:00
Jan Bartel 17269583fb Merge remote-tracking branch 'origin/master' into jetty-8 2012-03-30 12:05:46 +11:00
Greg Wilkins 65725b0025 357318: make the cancel key work around conditional on running on windows 2012-03-23 09:21:00 +11:00
Greg Wilkins 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
Greg Wilkins 7e3b8bcfd4 374611: do not redispatch if already dispatched when SSL reads content on write 2012-03-19 15:48:39 +11:00
Greg Wilkins 7842e9c101 374450: use temp read only buffers instead of synchronisation 2012-03-16 10:05:38 +11:00
Greg Wilkins a6eda90594 fixed merge issue 2012-03-16 09:16:46 +11:00
Simone Bordet fef74963af Forgotten modifications from Jetty7 2012-03-14 19:39:21 +01:00
Simone Bordet 5624a5721e Merged from master. 2012-03-14 18:24:57 +01:00
Simone Bordet 2e2247bde5 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2012-03-14 16:32:03 +01:00
Simone Bordet 4a02fdb6c0 374252 - SslConnection.onClose() does not forward to nested connection. 2012-03-14 16:12:46 +01:00
Greg Wilkins 708f8ccaeb 374158: do not asyncDispatch from SSL if suspended 2012-03-14 11:48:06 +11:00
Jesse McConnell b4985ad0d5 [maven-release-plugin] prepare for next development iteration 2012-03-08 23:53:50 -06:00
Jesse McConnell 7a99af4ffe [maven-release-plugin] prepare release jetty-8.1.2.v20120308 2012-03-08 23:53:42 -06:00
Jesse McConnell 246e3ed756 [maven-release-plugin] prepare for next development iteration 2012-03-08 21:09:46 -06:00
Jesse McConnell a63b3fdc5e [maven-release-plugin] prepare release jetty-7.6.2.v20120308 2012-03-08 21:09:37 -06:00
Jesse McConnell 381615f52d merge from master 2012-03-07 16:44:31 -06:00
Jesse McConnell 50d92ec8ef reset versions 2012-03-06 17:07:53 -06:00
Jesse McConnell f12e3c390c reset versions 2012-03-06 17:06:10 -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
Jesse McConnell d1c8c477ea [maven-release-plugin] prepare for next development iteration 2012-03-02 08:57:43 -06:00
Jesse McConnell b75868e84f [maven-release-plugin] prepare release jetty-8.1.2.v20120302 2012-03-02 08:57:19 -06:00
Jesse McConnell 51311d050e [maven-release-plugin] prepare for next development iteration 2012-03-02 08:37:46 -06:00
Jesse McConnell a8296ec3d5 [maven-release-plugin] prepare release jetty-7.6.2.v20120302 2012-03-02 08:37:38 -06: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
Jesse McConnell ac79497dee [maven-release-plugin] prepare for next development iteration 2012-02-15 14:29:36 -06:00
Jesse McConnell 3705b424c8 [maven-release-plugin] prepare release jetty-8.1.1.v20120215 2012-02-15 14:29:28 -06:00
Jesse McConnell efb6883cf0 [maven-release-plugin] prepare for next development iteration 2012-02-15 14:22:19 -06:00
Jesse McConnell baf2b94f77 [maven-release-plugin] prepare release jetty-7.6.1.v20120215 2012-02-15 14:22:12 -06: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 6e44f4db5f [maven-release-plugin] prepare for next development iteration 2012-01-27 08:15:45 -06:00
Jesse McConnell 9d1ca3593e [maven-release-plugin] prepare release jetty-8.1.0.v20120127 2012-01-27 08:15:38 -06:00
Jesse McConnell ad6126553b [maven-release-plugin] prepare for next development iteration 2012-01-27 08:13:06 -06:00
Jesse McConnell 4e25f7bb05 [maven-release-plugin] prepare release jetty-7.6.0.v20120127 2012-01-27 08:13:00 -06:00
Jesse McConnell f2d0fd3cc8 revert back to 8.1.0-SNAPSHOT 2012-01-26 10:45:06 -06:00
Jesse McConnell 7ac9eb585f revert back to 7.6.0-SNAPSHOT 2012-01-26 10:42:11 -06:00
Jesse McConnell e98ae91ca6 [maven-release-plugin] prepare for next development iteration 2012-01-25 11:16:11 -06:00
Jesse McConnell fb30166a7f [maven-release-plugin] prepare release jetty-8.1.0.v20120125 2012-01-25 11:16:05 -06:00
Jesse McConnell c918bb4e3c Merge branch 'master' into jetty-8 2012-01-25 10:31:44 -06:00
Jesse McConnell 0c96fc40ea [maven-release-plugin] prepare for next development iteration 2012-01-25 09:31:06 -06:00
Jesse McConnell b455b7d94e [maven-release-plugin] prepare release jetty-7.6.0.v20120125 2012-01-25 09:30:55 -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
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Jesse McConnell 0fa4fa9b23 clean up some warnings from maven 2012-01-09 14:57:21 -06: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
Greg Wilkins c5c6377e26 some IOTests to show that clients can write after server close??? 2011-12-20 09:21:18 +11:00
Greg Wilkins b027779830 364638 check for idle after shutdown output 2011-12-19 16:53:14 +11:00
Simone Bordet 3e05c1e59d Merged from origin/master. 2011-12-16 21:30:45 +01:00
Simone Bordet 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
Simone Bordet a88e2c5ebb Updated toString() implementations. 2011-12-16 20:53:15 +01:00
Jan Bartel e515b5b7dc JETTY-1460 suppress PrintWriter exceptions 2011-12-15 20:19:04 +11:00
Greg Wilkins bc48eb1f5b 366730 pass the time idle to onIdleExpire 2011-12-14 11:41:32 -08:00
Simone Bordet fa0e06d186 Removed guard whether the channel is closed in checkIdleTimestamp(). 
This follows commit ff29a1cc51 for JETTY-1322.
The reason to remove the guard is that the channel may be closed multiple times, and if for any reason
a check to the idle timestamp triggers, then the idle callback is invoked, but it's not really idle: it is
already closed.
When used with SSL, this causes a truncation attack exception thrown by SSLEngine, because the idle
callback causes a shutdown of the SSLEngine without having received a SSL close alert.
 2011-12-13 11:14:25 +01:00
Simone Bordet 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
Greg Wilkins de005c68fd Revert "Merge branch 'release-8'" 
This reverts commit 9e72457941, reversing
changes made to df12605f0e.
 2011-11-30 16:27:30 +11:00