4fc12483aa
Merge branch 'jetty-8' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project into jetty-8
2011-12-23 00:38:27 +11:00
0dfc9feaf9
367383 jsp-config element must be returned for ServletContext.getJspConfigDescriptor
2011-12-22 19:30:01 +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
e96f828dcf
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-21 14:12:46 -06:00
8981176dda
remove snapshot repo to see if that resolves issue with p2 snapshot build
2011-12-21 14:12:25 -06: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
ef23bf11b8
Merged from origin/master.
2011-12-21 10:45:06 +01:00
744f76f6c9
Added an idle timeout test.
2011-12-21 10:34:33 +01:00
55c98c010e
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-21 12:59:14 +11:00
2028bbb444
JETTY-1465 NPE in ContextHandler.toString
2011-12-21 12:57:33 +11:00
93a89026ce
364921 Improved timeout tests
2011-12-21 12:44:50 +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
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
8ea22a6a4c
367219 - WebSocketClient.open() fails when URI uses default ports.
2011-12-20 18:01:45 +01:00
ecb88f836e
367175 - SSL 100% CPU spin in case of blocked write and RST.
2011-12-20 13:25:55 +01:00
070a2b5759
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 14:54:50 +11:00
b67961ada3
JETTY-1463 websocket D0 parser should return progress even if no fill done
2011-12-20 12:00:48 +11:00
569e930185
367048 test harness for guard on suspended requests
2011-12-20 11:13:45 +11:00
b7d8bd4f28
364638 HttpParser closes if data received while seeking EOF. Tests fixed to cope
2011-12-20 10:55:56 +11:00
c5c6377e26
some IOTests to show that clients can write after server close???
2011-12-20 09:21:18 +11:00
d2a91f40cd
disable continuation 6 testing
2011-12-20 08:08:02 +11:00
960407492a
Removing System.out debug
2011-12-19 13:13:57 -07:00
93ebd1dbe5
Using straight Socket as HttpURLConnection request header modifications are not reliable enough for testing purposes
2011-12-19 13:06:54 -07:00
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
874a6502f4
Adding missing license headers.
2011-12-19 10:06:58 -07:00
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
f7103d88f9
364638 reverted write after shutdown handling
2011-12-19 21:56:42 +11:00
b027779830
364638 check for idle after shutdown output
2011-12-19 16:53:14 +11:00
f767d8d910
367048 improved handleRequest guard for suspended requests
2011-12-19 15:15:00 +11:00
44de94f185
Attempting to write a better timeout test
2011-12-16 14:45:38 -07:00
a5d18d48ad
Attempting to get a non-ssl version of the timeout bug into a unit test
2011-12-16 14:16:32 -07:00
3e05c1e59d
Merged from origin/master.
2011-12-16 21:30:45 +01:00
d52ed502b0
Sketch of test for idle expiration on SSL.
2011-12-16 21:26:37 +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
2b626be186
Minor fixes for Windows build isues
2011-12-15 16:04:07 -07:00
95d6b589a4
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-15 11:11:13 -07:00
5774c03e09
Refactoring protected fields back to private with protected methods per discussion with Simone
2011-12-15 11:07:27 -07:00
e515b5b7dc
JETTY-1460 suppress PrintWriter exceptions
2011-12-15 20:19:04 +11:00
ae8c8551fc
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 14:07:37 -07:00
300157fb2d
more time needed for ssl test on slow machine
2011-12-14 12:01:23 -08:00
5c5f783e2b
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-14 11:42:34 -08:00
bc48eb1f5b
366730 pass the time idle to onIdleExpire
2011-12-14 11:41:32 -08:00
c8e43ede1c
Merge branch 'master' into websocket-servlet-refactor
2011-12-14 11:15:20 -07:00
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
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
4aaf88af72
Merge branch 'master' of ssh://git.eclipse.org/gitroot/jetty/org.eclipse.jetty.project
2011-12-13 11:15:26 +01:00
bcbcbafb14
More tests for WebSocket over SSL.
2011-12-13 11:15:04 +01:00
Greg Wilkins
Jan Bartel
Jesse McConnell
Simone Bordet
Joakim Erdfelt