Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
3,090 Commits 59 Branches 460 Tags 355 MiB
Commit Graph

495 Commits

Author SHA1 Message Date
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
Greg Wilkins 631b0ba1b6 [maven-release-plugin] prepare for next development iteration 2011-11-30 13:16:54 +11:00
Greg Wilkins 9d3745f999 [maven-release-plugin] prepare release jetty-8.1.0.RC0 2011-11-30 13:16:41 +11:00
Greg Wilkins dcf7ef2335 fixes after merge 2011-11-29 10:15:20 +11:00
Greg Wilkins 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
Greg Wilkins 4ce72ee549 improved test timing 2011-11-29 08:36:56 +11:00
Greg Wilkins b969de1788 organized imports 2011-11-28 15:32:14 +11:00
Greg Wilkins 06b66f31f5 test NIO assumptions 2011-11-28 11:54:08 +11:00
Greg Wilkins 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
Simone Bordet 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
Simone Bordet c6103f2d53 Removed usages of ThreadDeath. 2011-11-24 20:39:04 +01:00
Simone Bordet 59c111bde1 Rewritten toString() methods using String.format(). 2011-11-24 15:20:06 +01:00
Simone Bordet 8f1fff78c0 Improved dumping capabilities of HttpClient, and rewritten toString() methods using String.format(). 2011-11-24 10:16:19 +01:00
Greg Wilkins aa0b71f928 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-22 13:16:40 +11:00
Greg Wilkins 6cb2d13abd Client idle connection uses onIdleExpired rather than close 2011-11-22 12:57:32 +11:00
Simone Bordet e1d05939b8 Merge remote-tracking branch 'origin/master' 2011-11-21 23:47:03 +01:00
Simone Bordet 83f2c1b55c Integrated behavior of is[In|Out]putShutdown() with volatile flag and previous implementation. 2011-11-21 23:31:09 +01:00
Simone Bordet 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
Greg Wilkins d55477388b more debug in tests 2011-11-22 00:12:56 +11:00
Jan Bartel 0e9449ac85 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-21 18:18:09 +11:00
Greg Wilkins a00f790bc5 fixed close on early shutdown 2011-11-21 10:25:26 +11:00
Greg Wilkins dbd97a52ae flush ssl shutdownoutput 2011-11-19 09:48:47 +11:00
Simone Bordet 712d250d3e Merge remote-tracking branch 'origin/master' 2011-11-18 12:45:05 +01:00
Greg Wilkins defc729d69 close idle SSL with shutdown 2011-11-18 15:33:05 +11:00
Greg Wilkins f70ed3ac21 prevent spin by write blocked from non dispatched thread 2011-11-18 09:19:52 +11:00
Simone Bordet 324f2049f3 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-11-17 12:40:56 +01:00
Simone Bordet d1592cf5b5 Added more SSL tests to detect spinning conditions. 2011-11-17 12:40:32 +01:00
Greg Wilkins 584bbd4bce improved siege 2011-11-17 16:31:22 +11:00
Jan Bartel b8b5df27d6 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 11:03:07 +11:00
Jan Bartel 127a5af8d7 Merge remote-tracking branch 'origin/master' into jetty-8 2011-11-17 10:59:54 +11:00
Greg Wilkins e48570bd5e SSL progress measured by process not inbound 2011-11-17 07:14:40 +11:00
Greg Wilkins e322a28753 made test timing less sensitive to Virtual machine quantums 2011-11-16 17:54:35 +11:00
Greg Wilkins ff656d4a17 less stressful test 2011-11-16 17:08:38 +11:00
Greg Wilkins de42eafdcd cleanup 2011-11-16 14:01:50 +11:00
Greg Wilkins a9d33bb561 maintain own ishut status 2011-11-16 13:15:36 +11:00