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

400 Commits

Author SHA1 Message Date
Jesse McConnell a2349abbcc [maven-release-plugin] prepare release jetty-8.1.0.RC4 2012-01-13 09:45:18 -06: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
Greg Wilkins c5e3ed5afe improved test timing 2012-01-11 16:39:03 +11:00
Jan Bartel 691efcc7ca Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-11 16:35:57 +11:00
Simone Bordet cecfa69a13 368189 - WebSocketClientFactory should not manage external thread pool. 
368240 - Improve AggregateLifeCycle handling of shared lifecycles

Reworked the implementation in order to follow 368240.
 2012-01-10 18:10:24 +01:00
Jan Bartel 1fbec51c8a Merge remote-tracking branch 'origin/master' into jetty-8 2012-01-10 16:08:59 +11:00
Simone Bordet 27cbf0bf78 367099 - Upgrade jetty-websocket for RFC 6455 - Addendum. 
The WebSocket parser was forgot in the renaming.
Took also the chance to remove hardcoded "D13" string in toString() methods.
 2012-01-09 20:27:46 +01:00
Simone Bordet 71ea564f0b 368189 - WebSocketClientFactory should not manage external thread pool. 2012-01-09 20:15:22 +01:00
Simone Bordet e666ed67cb 368035 - WebSocketClientFactory does not invoke super.doStop(). 2012-01-06 15:41:55 +01:00
Simone Bordet 06f0498a48 Made tests more reliable by waiting for the websocket connection to be established 
and for onOpen() to be called.
 2012-01-03 12:15:51 +01:00
Greg Wilkins 3141b50fa0 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-30 20:19:39 +11:00
Greg Wilkins 2b54d45280 367435 improved D00 test harness 2011-12-28 13:35:44 +11:00
Simone Bordet 3a1aff9221 Using a random port for the tests. 2011-12-23 23:59:05 +01:00
Simone Bordet 9e6dcc1c11 Restored constructor that was removed, used in CometD. 2011-12-23 23:54:55 +01:00
Simone Bordet 3cda41248e 367502 - WebSocket connections should be closed when application context is stopped. 2011-12-23 23:43:02 +01:00
Simone Bordet 62f47e0617 367502 - WebSocket connections should be closed when application context is stopped. 2011-12-23 17:20:57 +01:00
Jesse McConnell ed46b71f37 Merge branch 'master' into jetty-8 2011-12-23 07:44:29 -06:00
Greg Wilkins 34dc926c59 367433 added tests to investigate 2011-12-23 19:19:20 +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
Simone Bordet ef23bf11b8 Merged from origin/master. 2011-12-21 10:45:06 +01:00
Jan Bartel c3643d9937 Merge remote-tracking branch 'origin/master' into jetty-8 2011-12-21 12:37:23 +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
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
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
Simone Bordet 3e05c1e59d Merged from origin/master. 2011-12-16 21:30:45 +01:00
Simone Bordet a88e2c5ebb Updated toString() implementations. 2011-12-16 20:53:15 +01: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
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 bcbcbafb14 More tests for WebSocket over SSL. 2011-12-13 11:15:04 +01:00
Joakim Erdfelt 004fa1ce1c Bug 365973 - Websocket client on android causes many VFY errors and 
warnings.

+ Splitting out WebSocketConnection#handshake() into new
  WebSocketServletConnection interface and refactoring accordingly,
  in order to remove servlet-api dep on WebSocketConnection for
  appropriate websocket client use.
 2011-12-12 09:02:40 -07:00
Joakim Erdfelt 6d2ad43cc4 365932 - Produce jetty-websocket aggregate jar for android use 
+ revert last change using maven-shade-plugin as it didn't address
  the now redundant transitive dependencies present in the
  jetty-websocket pom.
+ made a formal jetty-aggregate/jetty-websocket build instead.
 2011-12-07 12:13:57 -07:00
Joakim Erdfelt 6b54650046 365932 - Produce jetty-websocket aggregate jar for android use 
+ Adding maven-shade-plugin default configuration (no bytecode
  manipulation) to produce an aggregate classifier jar for
  jetty-websocket use.
 2011-12-07 10:17:20 -07:00
Simone Bordet 0689e05e9b 365750 - Support WebSocket over SSL, aka wss:// 
This is now implemented, using the new architecture of wrapping the connection with
SslConnection.
The only refactoring was to avoid that the HTTP handshake was sent from the
HandshakeConnection constructor, because at that point the SSL wiring is not ready yet.
Now the handshake is sent from handle(), guarded by a boolean variable to sent it once.
 2011-12-06 16:25:15 +01:00
hmalphettes 89afbdf31d 360245 OSGi: javax.servlet packages version refactored 3.0 -> 2.6 2011-12-02 17:27:26 +08: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 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