Commit Graph

3448 Commits

Author SHA1 Message Date
Simone Bordet ef23bf11b8 Merged from origin/master. 2011-12-21 10:45:06 +01:00
Simone Bordet 744f76f6c9 Added an idle timeout test. 2011-12-21 10:34:33 +01:00
Jan Bartel 55c98c010e Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-21 12:59:14 +11:00
Jan Bartel 2028bbb444 JETTY-1465 NPE in ContextHandler.toString 2011-12-21 12:57:33 +11:00
Greg Wilkins 93a89026ce 364921 Improved timeout tests 2011-12-21 12:44:50 +11:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +11:00
Jan Bartel cc84c3d6a0 Merge remote-tracking branch 'origin/master' into bug-359329 2011-12-21 10:57:21 +11:00
Greg Wilkins a606529710 364921 SslConnection does real close on idle if already oshut 2011-12-21 10:06:55 +11:00
Joakim Erdfelt 2ca897c1ea 367219 - WebSocketClient.open() fails when URI uses default ports.
+ Fixing testcase to not fail if http://localhost/ exists.
  Reworking code to not rely on existence of server to validate the
  correct behavior of URI port parsing.
2011-12-20 13:01:23 -07:00
Simone Bordet 8ea22a6a4c 367219 - WebSocketClient.open() fails when URI uses default ports. 2011-12-20 18:01:45 +01: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 070a2b5759 JETTY-1463 websocket D0 parser should return progress even if no fill done 2011-12-20 14:54:50 +11:00
Greg Wilkins b67961ada3 JETTY-1463 websocket D0 parser should return progress even if no fill done 2011-12-20 12:00:48 +11:00
Greg Wilkins 569e930185 367048 test harness for guard on suspended requests 2011-12-20 11:13:45 +11:00
Greg Wilkins b7d8bd4f28 364638 HttpParser closes if data received while seeking EOF. Tests fixed to cope 2011-12-20 10:55:56 +11: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 d2a91f40cd disable continuation 6 testing 2011-12-20 08:08:02 +11:00
Joakim Erdfelt 960407492a Removing System.out debug 2011-12-19 13:13:57 -07:00
Joakim Erdfelt 93ebd1dbe5 Using straight Socket as HttpURLConnection request header modifications are not reliable enough for testing purposes 2011-12-19 13:06:54 -07:00
Joakim Erdfelt 95f763fab4 Bug 367099 - Upgrade jetty-websocket for RFC 6455
+ Adding new RFC declared close codes 1011 (CLOSE_SERVER_ERROR) and
  1015 (CLOSE_FAILED_TLS_HANDSHAKE)
+ Adding support for responding as CLOSE_SERVER_ERROR if an unhandled
  exception (similar to how HTTP error 500 works) but for exceptions
  thrown out of implementations of WebSocket.
+ Adding guard to prevent use of CLOSE_FAILED_TLS_HANDSHAKE on
  close control frame.
+ Adding unit test for the CLOSE_SERVER_ERROR case.
+ Adding unit test for HTTP response 400 on bad Sec-WebSocket-Version
  request header value.
2011-12-19 12:29:15 -07:00
Joakim Erdfelt 874a6502f4 Adding missing license headers. 2011-12-19 10:06:58 -07:00
Joakim Erdfelt 6d907fa61d Bug 367099 - Upgrade jetty-websocket for RFC 6455
+ Renaming *D13 classes to *RFC6455 per dicussion in jetty-dev mailing
list
2011-12-19 10:03:01 -07:00
Greg Wilkins f7103d88f9 364638 reverted write after shutdown handling 2011-12-19 21:56:42 +11:00
Greg Wilkins b027779830 364638 check for idle after shutdown output 2011-12-19 16:53:14 +11:00
Greg Wilkins f767d8d910 367048 improved handleRequest guard for suspended requests 2011-12-19 15:15:00 +11:00
Jan Bartel 397aa79a50 Merge remote-tracking branch 'origin/master' into bug-359329 2011-12-19 15:01:29 +11:00
Joakim Erdfelt 44de94f185 Attempting to write a better timeout test 2011-12-16 14:45:38 -07:00
Joakim Erdfelt a5d18d48ad Attempting to get a non-ssl version of the timeout bug into a unit test 2011-12-16 14:16:32 -07:00
Simone Bordet 3e05c1e59d Merged from origin/master. 2011-12-16 21:30:45 +01:00
Simone Bordet d52ed502b0 Sketch of test for idle expiration on SSL. 2011-12-16 21:26:37 +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
Joakim Erdfelt 2b626be186 Minor fixes for Windows build isues 2011-12-15 16:04:07 -07:00
Joakim Erdfelt 95d6b589a4 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-15 11:11:13 -07:00
Joakim Erdfelt 5774c03e09 Refactoring protected fields back to private with protected methods per discussion with Simone 2011-12-15 11:07:27 -07:00
Jan Bartel ee0ba9ceb1 Merge remote-tracking branch 'origin/master' into bug-359329 2011-12-15 20:22:37 +11:00
Jan Bartel e515b5b7dc JETTY-1460 suppress PrintWriter exceptions 2011-12-15 20:19:04 +11:00
Joakim Erdfelt ae8c8551fc Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-14 14:07:37 -07:00
Greg Wilkins 300157fb2d more time needed for ssl test on slow machine 2011-12-14 12:01:23 -08:00
Greg Wilkins 5c5f783e2b Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-14 11:42:34 -08:00
Greg Wilkins bc48eb1f5b 366730 pass the time idle to onIdleExpire 2011-12-14 11:41:32 -08:00
Joakim Erdfelt c8e43ede1c Merge branch 'master' into websocket-servlet-refactor 2011-12-14 11:15:20 -07:00
Joakim Erdfelt 6b42a1c45d JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
+ Implementation of Safari WebSocket Draft-0 behavior in a unit test.
  (Test fails, and is currently set as @Ignore)
2011-12-14 10:23:40 -07:00
Joakim Erdfelt 42816041c0 JETTY-1463 - WebSockets with Safari gets messages stuck as if in a buffer that needs to be flushed.
+ Adding unit test to attempt to replicate behavior (test passes)
2011-12-13 11:26:30 -07:00
Simone Bordet 4aaf88af72 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-13 11:15:26 +01:00
Simone Bordet bcbcbafb14 More tests for WebSocket over SSL. 2011-12-13 11:15:04 +01: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
Jan Bartel d8c8d7a645 Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project 2011-12-13 11:08:19 +11:00
Jan Bartel dfb96dfeeb 366342 Dont persist DosFilter trackers in http session 2011-12-13 11:07:26 +11:00
Jesse McConnell c1dac27886 Bug 366362 - JAX-WS over https returns the wrong request address. Applied patch by Kenny Stridh . Thanks! 2011-12-12 16:17:30 -06:00