Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-23 16:05:00 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,210 Commits 55 Branches 466 Tags
Commit Graph

3076 Commits

Author SHA1 Message Date
Lachlan Roberts
eabae232e5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-20 12:59:31 +10:00
Lachlan
44986be6c0
fix flaky test ClientCloseTest.testStopLifecycle() in jetty 9.4.x (#3990) 
* fix flaky test ClientCloseTest.testStopLifecycle() in 9.4.x

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* test code cleanups in ClientCloseTest

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-20 12:49:52 +10:00
Joakim Erdfelt
50b524bb6b Merge branch release-9.4.20 into jetty-9.4.x 2019-08-15 07:27:25 -05:00
Lachlan Roberts
7d7d932288 Issue #3968 - remove public from methods in ReadState 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-15 09:16:05 +10:00
Lachlan Roberts
11d1ad6504 disable flaky test WebSocketConnectionStatsTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-15 08:04:57 +10:00
Lachlan
2a109dccbc
Issue #3968 - prevent ReadPending and ISE from AbstractWebSocketConnection (#3979) 
* Issue #3968 - websocket suspend fix and cleanups

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3968 - fixed race conditions when using websocket ReadState

combine the previous ReadMode into ReadState by using ReadState.Action
which is returned from ReadState.getAction(ByteBuffer) where an atomic
decision is made of what action to do

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-14 21:28:35 +10:00
Joakim Erdfelt
f1efc99918 Updating to version 9.4.21-SNAPSHOT 2019-08-13 17:34:20 -05:00
Joakim Erdfelt
84700530e6 Updating to version 9.4.20.v20190813 2019-08-13 16:13:21 -05:00
Simone Bordet
a700907522
Issue #250 - Implement HTTP CONNECT for HTTP/2. (#3539) 
Fixes #250 - Implement HTTP CONNECT for HTTP/2.

Modified HTTP/2 implementation to support the CONNECT method.
Implemented semantic defined by RFC 8441.
Implemented section 8.3 of RFC 7540.
Introduced HTTP2Client.streamIdleTimeout.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2019-08-13 19:07:04 +03:00
Lachlan Roberts
ee40006a5e remove NullMessage from websocket jetty-9.4.x merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-13 15:28:20 +10:00
Joakim Erdfelt
3ee665700d Merge branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/CloseTrackingEndpoint.java
#	jetty-websocket/jetty-websocket-tests/src/test/java/org/eclipse/jetty/websocket/tests/client/WebSocketClientTest.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyAnnotatedEventDriver.java
#	jetty-websocket/websocket-common/src/main/java/org/eclipse/jetty/websocket/common/events/JettyListenerEventDriver.java
 2019-08-07 05:28:06 -05:00
Joakim Erdfelt
b8f29630ed Issue #3884 - Updating tests and fixing merge 
+ Test cases have been updated based on PR review
+ Fixing merge from `jetty-9.4.x` that caused a duplicate
  JettyListenerEventDriver.onContinuationFrame() method

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-08-05 12:52:20 -05:00
Joakim Erdfelt
1ee771e991 Merge branch jetty-9.4.x into jetty-9.4.x-3884-websocket-frame-listener 2019-08-05 12:27:53 -05:00
Lachlan Roberts
bab274be85 fix to PartialListenerTest from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-08-02 15:15:57 +10:00
olivier lamy
41e5b9f16c disable merged test PartialListenerTest from 9.4.x 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-02 14:24:22 +10:00
olivier lamy
5be9f1a927 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-08-02 13:46:45 +10:00
olivier lamy
c08b7b9e56 fix compilation 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-08-01 20:29:44 +10:00
Joakim Erdfelt
f36358c631 Issue #3884 - Adding NullMessage to satisfy PR review 
+ If an annotated Jetty WebSocket Endpoint doesn't have
  a handler for data types TEXT or BINARY then the
  new NullMessage (sink) is used for that specific data type
  to consume (quietly) those ignored Messages.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-07-18 08:04:17 -05:00
Joakim Erdfelt
02c49efc5f Issue #3884 - Adding testcase to satisfy PR review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-07-18 07:51:12 -05:00
Joakim Erdfelt
f4ce98b1c8 Issue #3884 - Pure @OnWebSocketFrame usage should not process Continuation events 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-07-17 15:51:35 -05:00
Joakim Erdfelt
f7b212abb0 Issue #3884 - Pure WebSocketFrameListener should not process Continuation events 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-07-17 14:34:51 -05:00
Joakim Erdfelt
f20d403480 Issue #3876 - Additional testcase 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-07-16 13:04:19 -05:00
Joakim Erdfelt
ec9f4ef392 Issue #3876 - WebSocket Partial Listener testcases and fix 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2019-07-16 07:07:55 -05:00
olivier lamy
6df9ef3a15 Updating to version 10.0.0-SNAPSHOT 2019-07-12 06:54:56 +10:00
olivier lamy
8cbfd51e80 Updating to version 10.0.0-alpha0 2019-07-12 06:54:56 +10:00
olivier lamy
a34e641a27 Updating to version 10.0.0-SNAPSHOT 2019-07-11 17:20:27 +10:00
olivier lamy
2e58f2f515 Updating to version 10.0.0-alpha0 2019-07-11 14:19:45 +10:00
olivier lamy
352d1e7c3b fix checkstyle 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2019-07-09 18:27:14 +10:00
Lachlan Roberts
9449008581 Issue #3849 - only notify onError for local errors 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-05 16:06:56 +10:00
Lachlan Roberts
6eee5ad415 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 14:30:45 +10:00
Lachlan
d8164a1728
Merge pull request #3836 from eclipse/jetty-9.4.x-3835-WebSocketSession-LifeCycle 
Issue #3835 - ensure WebSocketSessions are always stopped
 2019-07-04 12:59:49 +10:00
Lachlan Roberts
d4217cb20b Merge remote-tracking branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 12:39:03 +10:00
Lachlan Roberts
062444630f Merge remote-tracking branch jetty-9.4.x into jetty-9.4.x-3835-WebSocketSession-LifeCycle 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 11:15:23 +10:00
Lachlan Roberts
d69bf31494 Issue #300 - fix test expectation after CompressExtension changes 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 11:10:24 +10:00
Lachlan Roberts
bb1a260fa5 Merge remote-tracking branch jetty-10.0.x into jetty-10.0.x-300-CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 10:22:10 +10:00
Lachlan Roberts
50c18798ba Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-9.4.x-300-CompressionPool 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-04 10:19:54 +10:00
Greg Wilkins
d744d097de
Checkstyle cleanup (#3847) 
* Checkstyle cleanup
* fixed bug from reformat
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-07-03 17:24:08 +02:00
Greg Wilkins
9fe27eb8e3 Updated all arrays after merge of #3846 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2019-07-03 17:23:02 +02:00
Jan Bartel
5568f833e7 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-07-03 16:53:00 +02:00
Jan Bartel
bb7fb48f08
Fix checkstyle warnings for tests. (#3846) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2019-07-03 16:42:20 +02:00
Lachlan Roberts
1554b3dbb1 Issue #3835 - add default methods to WebSocketSessionListener 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-03 11:33:32 +10:00
Lachlan Roberts
07ee1d8fc6 Merge remote-tracking branch jetty-9.4.x into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-03 11:21:30 +10:00
Lachlan
f3f13c4ca9
Issue #2061 - fail current entry in CompressExtension on failure (#3830) 
* Issue #2061 - fail current entry in CompressExtension on failure

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #2061 - do not notify callback failure twice

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-03 11:09:34 +10:00
Lachlan Roberts
196833d15e Issue #3835 - fix SessionTracker dump, add test assertions 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-02 19:06:05 +10:00
Lachlan Roberts
705e1cafe0 Issue #300 - use inflater/deflater pools in CompressExtension 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-02 16:42:50 +10:00
Lachlan Roberts
64eb3217cd Issue #300 - refactor usages of WebSocketComponents 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-02 15:28:58 +10:00
Lachlan Roberts
c5172df484 fix RestartContextTest for javax WebSockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-02 11:32:08 +10:00
Lachlan
cbc4768cae
Issue #3159 - do not copy RSV bits to auto-fragmented frames (#3816) 
* Issue #3159 - do not copy RSV bits to auto-fragmented frames

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - warn if DeflateFrameExtension detects autoFragment on

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - automatically set auto-fragment false in DeflateFrameExt

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - add todo

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-01 17:06:32 +10:00
Lachlan
ac8910e044
Issue #3809 - ensure abnormal close frame will hard close ws connection (#3819) 
* Issue #3809 - ensure abnormal close frame will hard close ws connection

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #3159 - signal onError on abnormal status code close

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-01 16:50:56 +10:00
Lachlan Roberts
2383bf4974 Issue #3835 - ensure WebSocketSessions are always stopped 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2019-07-01 16:40:45 +10:00