Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-24 00:17:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,417 Commits 55 Branches 466 Tags
Commit Graph

3517 Commits

Author SHA1 Message Date
Lachlan Roberts
a6b2b3ff98 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4340-ServiceLoader 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-03-13 17:02:26 +11:00
Lachlan Roberts
ac69c53077 jetty websocket modules should not transitively export websocket-core 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-03-13 12:07:36 +11:00
Lachlan Roberts
a0626adad5 javax websocket modules should not transitively export websocket-core 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-03-12 16:21:07 +11:00
Lachlan Roberts
3d74148652 Issue #4650 - do not use ServiceLoader every time a WSSession is started 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-03-12 12:34:03 +11:00
Lachlan Roberts
fef25e7825 Merge branch jetty-10.0.x into jetty-10.0.x-4538-MessageReaderWriter 2020-03-11 14:23:47 +11:00
Olivier Lamy
3a77542303
upgrade shade plugin and align version (#4639) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-03-05 09:10:12 +10:00
Lachlan
b014e2faca
Merge pull request #4597 from eclipse/jetty-9.4.x-847-WSasyncWriteTimeout 
Issue #847 - deprecate asyncWriteTimeout in the jetty websocket API
 2020-03-02 10:19:01 +11:00
Joakim Erdfelt
8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt
a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
Lachlan Roberts
81424f1f44 Issue #4340 - Continuing after ServiceLoader ServiceConfigurationError 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-25 19:49:22 +11:00
Lachlan Roberts
b138ce55bb Issue #847 - deprecate asyncWriteTimeout in the jetty websocket api 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-21 14:58:19 +11:00
Lachlan Roberts
adbb3f165e Issue #4571 - review UTF-8 validation in MessageSinks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-20 19:00:53 +11:00
Lachlan Roberts
34fd1481b8 Issue #4571 - always close MessageSink before completing the Future 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-20 18:47:04 +11:00
Lachlan Roberts
b2eddff228 Issue #4571 - fix broken tests 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 19:38:26 +11:00
Lachlan Roberts
bc6c950304 add missing licence header 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 19:33:11 +11:00
Lachlan Roberts
5c839d791d Issue #4538 - allow MessageInputStream not to read to EOF 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 19:31:26 +11:00
Lachlan Roberts
97abed549b Issue #4538 - Combine MessageWriterTests, add test for UTF-8 validation 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 16:13:22 +11:00
Lachlan Roberts
1b123b87a9 Issue #4538 - add invalid utf8 validation tests for MessageReader 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 11:32:37 +11:00
Lachlan Roberts
2467d5a8c5 Issue #4538 - Rework MessageInputStream and MessageReader 
Message reader now validates UTF8

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 11:32:26 +11:00
Lachlan Roberts
6eccc7ebce Issue #4538 - MessageWriter delegates to MessageOutputStream 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 11:32:15 +11:00
Lachlan Roberts
e2f86f9a19 Issue #4538 - simplify MessageInputStream and DispatchedMessageSink 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 11:32:03 +11:00
Lachlan Roberts
71b11f0887 Issue #4571 - simplify partial MessageSinks reduce copying 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 11:26:56 +11:00
Lachlan Roberts
36cccd2c88 Issue #4571 - optimise aggregating text and binary MessageSinks 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-19 11:25:05 +11:00
Lachlan
5fe202f29f
Issue #4548 - clean up websocket removing duplicated and unused classes (#4549) 
Create new module websocket-util which contains implementation classes shared by websocket-jetty and websocket-javax. Many of these classes had to be changed as the javax and jetty versions of them differed slightly.

Also includes general cleanups, removed unused interfaces and classes, etc..
 2020-02-18 21:43:54 +11:00
Lachlan
aaf6f17766
Merge pull request #4555 from eclipse/jetty-9.4.x-4537-WebSocketSpin 
Issue #4537 - fix potential spin when discarding in WebSocketConnection
 2020-02-13 09:14:06 +11:00
Sergey Tselovalnikov
66f4bda2ea comments 
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
 2020-02-10 21:02:36 +11:00
Sergey Tselovalnikov
d371c1498c Improve performance of small websocket messages 
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
 2020-02-10 20:07:33 +11:00
Lachlan Roberts
20621b76fb Issue #4537 - fix potential spin when discarding in WebSocketConnection 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-10 18:29:55 +11:00
Olivier Lamy
abdb9f2ff6
Jetty 10.0.x methodhandles lookup linkage (#4552) 
* use a lookup dedicated to the target class (webapp classloader) to avoid collision with server classloader

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* cleanup war test dependencies

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove empty lines

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* make it clear it is a bad websocket webapp only for testing purpose and add a good websocket webapp

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* no need anymore of this dependency

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-02-09 11:59:57 +10:00
Lachlan
e4c1984fd0
Merge pull request #4536 from eclipse/jetty-10.0.x-4447-websocketModules 
Issue #4447 - separate modules for jetty and javax websockets
 2020-02-07 16:15:27 +11:00
Lachlan Roberts
b3144dd401 Issue #4447 - update websocket-jetty module description 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-07 16:14:32 +11:00
Lachlan
41a7b8d4e3
Merge pull request #4539 from eclipse/jetty-10.0.x-4501-SharedBlockingCallback 
Issue #4501 - remove all SharedBlockingCallback usage from websocket
 2020-02-05 10:07:12 +11:00
Lachlan Roberts
cbb09413fd Issue #4501 - fix test expectations to throw CloseChannelException 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-03 18:34:19 +11:00
Lachlan Roberts
3344772e2f Issue #4447 - hard code in version for javax-websocket-api 1.1.2 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-03 18:29:46 +11:00
Lachlan Roberts
182daf8504 Issue #4501 - remove all SharedBlockingCallback usage from websocket 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-02-03 17:20:45 +11:00
Lachlan
f8219a56cc
Merge pull request #4535 from eclipse/jetty-10.0.x-4462-javaxWSClose 
Issue #4462 - do not throw IOException on Javax websocket close
 2020-02-03 10:22:23 +11:00
Lachlan Roberts
fde1ab3e5b Issue #4462 - fix incorrect test expectations 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-31 16:31:35 +11:00
Lachlan Roberts
a7c0c57496 Issue #4447 - separate modules for jetty and javax websockets 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-31 15:58:20 +11:00
Lachlan Roberts
bdaa06e8dd Issue #4462 - do not throw IOException on Javax websocket close 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-31 11:09:30 +11:00
Simone Bordet
ce6e146ac1
Merge pull request #4489 from eclipse/jetty-10.0.x-2643-pkcs12_keystores 
Fixes #2643 - Switch SslContextFactory.keystoreType from JKS to PKCS12.
 2020-01-30 19:28:49 +01:00
Lachlan Roberts
b4d2ccc6b8 Make the WebSocketServerContainer initialize methods private 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-30 15:01:15 +11:00
Lachlan Roberts
006fd3f913 Issue #4226 - fix test failures 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-30 11:26:51 +11:00
Lachlan Roberts
82c61c48eb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4226-JavaxWebSocketJPMS 2020-01-30 10:37:34 +11:00
Lachlan
19354d0c24
Merge pull request #4523 from eclipse/jetty-10.0.x-4502-wsOnClose 
Issue #4502 - allow changing of close response from jetty and javax websocket onClose events
 2020-01-30 09:10:48 +11:00
Simone Bordet
96741ebb28 Fixed compilation issues after merge. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-01-29 10:11:21 +01:00
Lachlan Roberts
1afb7fd1f2 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4450-WebSocketCoreJPMS 2020-01-29 19:21:39 +11:00
Lachlan Roberts
8638fb2cc3 Fix broken test cases 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-29 19:13:03 +11:00
Lachlan Roberts
fdd27a9f28 Issue #4502 - add onClose tests for Jetty and Javax WS APIs 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-29 15:20:36 +11:00
Lachlan Roberts
4ef208e9f6 Issue #4502 - onClose can now be triggered on receiving a close frame 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-01-29 15:19:48 +11:00
Lachlan
f6fd3c41a5
Issue #4462 - Prevent jetty 10 WebSocket close deadlocks (#4472) 
- Replicate problems from WS close deadlock with test cases
- use FutureCallback instead of SharedBlockingCallback for WS blocking methods
- add timeout to the blocking callbacks for WS for (idleTimeout + 1000ms)
- Core throws ClosedChannelException instead of ISE if send after closed
 2020-01-29 09:15:40 +11:00