Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,327 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

203 Commits

Author SHA1 Message Date
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
olivier lamy 538bf872a3 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-02-10 11:21:12 +10:00
Lachlan Roberts 2ac50130d6 Issue #5868 - allow request attributes to be set during websocket handshake 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-02-02 17:48:11 +11:00
Joakim Erdfelt 10136235b2
Happy New Year 2021 (Jetty 11 edition) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 15:22:28 -06:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition) 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-01-21 15:05:57 -06:00
Lachlan Roberts 7de53ea445 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-20 16:29:34 +11:00
Lachlan f2cde85390
Merge pull request #5874 from eclipse/jetty-10.0.x-5866-WebSocketProgrammaticUpgrade 
Issue #5866 - allow WebSocket programmatic upgrades
 2021-01-20 16:07:07 +11:00
Lachlan Roberts 17177abfd7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-01-13 15:18:06 +11:00
Lachlan Roberts 0d48b8b991 Issue #5866 - add Programmatic WebSocket Upgrade to Jetty API 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-01-13 10:45:45 +11:00
Lachlan Roberts 78707fffde CreatorNegotiator should remain private, use from on WebSocketNegotiator 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-01-13 09:55:19 +11:00
Lachlan Roberts 0a944ac0a9 Issue #5866 - allow programmatic upgrades with websocket-core 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-01-08 22:47:55 +11:00
Lachlan Roberts 02963baae3 disable part of tests due to bug with ServerUpgradeResponse 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-01-05 08:48:55 +11:00
Lachlan Roberts 281f6d13ed Issue #5850 - add tests for the UpgradeRequests in the FrameHandlers 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-01-04 15:55:47 +11:00
Lachlan Roberts b72cadc6f5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-21 14:51:02 +11:00
Lachlan Roberts c16674bae7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5706-ServerUpgradeResponse 2020-12-15 16:51:47 +11:00
Joakim Erdfelt d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-11 11:40:10 -06:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-10 16:04:50 -06:00
Lachlan Roberts 04b893bf2c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-10 15:18:29 +11:00
Lachlan 1753dec720
Issue #5774 - make fields and classes in Client/Server ConfigTest static (#5777) 
* Issue #5774 - make fields and classes in Client/Server ConfigTest static

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

* changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-10 15:17:02 +11:00
Lachlan Roberts c9409befd8 Issue #5706 - fix potential NPE from websocket-core ServerUpgradeResponse 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-08 16:54:13 +11:00
Joakim Erdfelt 30bd8b9fba Updating to version 11.0.1-SNAPSHOT 2020-12-02 15:59:13 -06:00
Joakim Erdfelt 432f896d7a Updating to version 11.0.0 2020-12-02 15:35:56 -06:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Lachlan Roberts cf9a807d67 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-02 12:04:23 +11:00
Lachlan 121d898517
Move websocket-util classes into websocket-core (#5705) 
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util

* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
 2020-12-02 11:10:15 +11:00
Simone Bordet bdc33aba3b Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-01 13:25:10 +01:00
Simone Bordet 38aec0b081 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-01 13:24:26 +01:00
Lachlan Roberts c8ec3fe567 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-26 21:05:43 +11:00
Lachlan Roberts 4ec2c3eca2 fix websocket proxy for jetty10 websocket api 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-26 21:05:06 +11:00
Lachlan Roberts cb626e72bc Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-26 20:49:49 +11:00
Lachlan Roberts 9fe3380c35 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-26 17:27:03 +11:00
Lachlan Roberts 741ad918e4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-26 17:20:05 +11:00
Simone Bordet 8a37363a3f Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-11-23 16:59:59 +01:00
Lachlan Roberts 6a83a261e1 Always add the default WebSocketUpgradeFilter as the first filter. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-18 21:27:25 +11:00
Lachlan Roberts aba2c93eae Add tests for the ordering of the default WebSocketUpgradeFilter. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-18 15:10:14 +11:00
Lachlan Roberts f52e61156d add test for a subclassed WebSocketUpgradeFilter 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-17 20:57:21 +11:00
Lachlan Roberts 165beff3f3 add test for multiple WebSocketUpgradeFilters 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-14 10:43:14 +11:00
Lachlan Roberts 0493a11106 Use Filter name to identify the WebSocketUpgradeFilter. 
Don't allow configuration of WebSocketMapping attribute.
The WebSocketUpgradeFilter is identified by it's name, which must be set as the fully qualified class name.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-13 22:06:20 +11:00
Lachlan Roberts 2758589da8 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-11-06 19:06:30 +11:00
Lachlan Roberts f857ac9756 fix failures from incorrectly configured WebSocketUpgradeFilters 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-04 15:13:59 +11:00
Lachlan Roberts 5f5eff36cb Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 17:14:00 +11:00
Lachlan Roberts 0e3cfe8fc2 Issue #5287 - share compression pools and size with max num threads 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-14 22:28:26 +11:00
Joakim Erdfelt 57a9e5236a
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-08 09:01:58 -05:00
Lachlan Roberts 2a4d672fc1 Issue #5378 - improve testing for WebSocketUpgradeFilter 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-10-08 08:46:51 +11:00
Joakim Erdfelt c223ee37ab Updating to version 11.0.0-SNAPSHOT 2020-10-02 16:38:23 -05:00
Joakim Erdfelt 9ce21ec22b Updating to version 11.0.0.beta2 2020-10-02 16:20:55 -05:00
Joakim Erdfelt fcc3b6b4cd
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-25 10:09:58 -05:00
Lachlan Roberts 8d526af3a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-10 11:07:44 +10:00
Lachlan Roberts 5d1d7c9c26 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-10 10:55:34 +10:00
Lachlan Roberts 609f0b2159 Merge branch 'jetty-10.0.x-4824-WSmaxOutgoingFrames' into jetty-10.0.x 2020-09-10 10:51:57 +10:00
Lachlan Roberts b7fb631b2d Merge remote-tracking branch 'origin/jetty-9.4.x-4824-WSmaxOutgoingFrames' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-10 09:48:39 +10:00
Lachlan Roberts 6b4f198f6b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-09 17:22:28 +10:00
Lachlan Roberts 8bbea55ed9 remove the extensions package as extensions are now written in websocket-core 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-04 16:44:23 +10:00
Lachlan Roberts 8492697ae0 move Jetty WS API exceptions to separate package 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-09-04 16:40:16 +10:00
Lachlan Roberts 4517d4fe3f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-02 15:50:39 +10:00
Lachlan Roberts 43f41ae046 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-02 15:48:25 +10:00
Jan Bartel e47d2fb32b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 17:20:56 +02:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167) 
* Issue #4996 Regularize logging

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-08-24 17:15:13 +02:00
Lachlan Roberts 413f79949a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-19 09:47:05 +10:00
Lachlan Roberts 35f3f1886e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-19 09:39:31 +10:00
Lachlan Roberts 7d6f692721 disable autoFragment for WebSocketStatsTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-19 09:32:54 +10:00
Lachlan Roberts a87e88576d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-19 09:25:21 +10:00
Lachlan Roberts 931e10458a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-19 08:34:39 +10:00
olivier lamy e26126264a Updating to version 11.0.0-SNAPSHOT 2020-08-11 16:48:06 +08:00
olivier lamy 6b2b429ba5 Updating to version 11.0.0.beta1 2020-08-11 16:48:06 +08:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Lachlan Roberts b9fa84e3fc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-06 09:27:31 +10:00
Lachlan 1e7ce3ac1e
Merge pull request #5101 from eclipse/jetty-10.0.x-5044-WebSocketUpgradeRequestResponse 
Issue #5044 - Refactor of Jetty WebSocket Upgrade Request/Response
 2020-08-06 09:11:12 +10:00
Lachlan Roberts a00b5a06c9 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-05 09:38:51 +10:00
Lachlan Roberts 9cde41a75c Issue #5096 - add WebSocketFilter lazily if only using JettyWebSocketServlet 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-08-03 19:01:41 +10:00
Lachlan Roberts ce8cb063ea Issue #5044 - extend Jetty WS API Request/Response interfaces for jetty-websocket-server 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-30 17:34:17 +10:00
Lachlan Roberts dfb6127baa Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-29 13:37:35 +10:00
Lachlan Roberts e13d26ab45 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-24 13:39:07 +10:00
Lachlan Roberts 7534ef74d8 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-23 13:01:06 +10:00
Lachlan Roberts da9c8e4e55 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 12:18:23 +10:00
Lachlan Roberts d5cf429537 fix websocket tests from merge 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 12:17:20 +10:00
Lachlan Roberts e77c253267 Issue #5018 - fix merge to jetty-10, WSClient.connect Future should fail upgrade 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 11:17:05 +10:00
Lachlan Roberts 5726fa9364 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 10:19:53 +10:00
Lachlan Roberts bdfd6853b0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 08:11:52 +10:00
Lachlan Roberts 695d239ac5 Issue #4919 - all websocket containers to implement Graceful shutdown interface 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-23 00:09:43 +10:00
Lachlan Roberts 9f7f2e3e56 WebSocket server now only closes gracefully if the Server stopTimeout is set 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-20 15:49:15 +10:00
Lachlan Roberts c94e82470d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4919-WebSocketContainerStop 2020-07-17 15:32:10 +10:00
Lachlan Roberts 0a30525653 Issue #5043 - allow WebSocketListener / Endpoint anonymous classes to be used 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 12:44:54 +10:00
Lachlan Roberts 00777fe05a Issue #5043 - add testing for WebSocketListener / Endpoint as anonymous classes 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-16 12:21:03 +10:00
Lachlan Roberts 6cad9ed902 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-16 09:20:54 +10:00
Jan Bartel 0b57809c04 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-14 14:19:50 +02:00
Lachlan Roberts df34a6269b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5018-WebSocketClientRequestTimeout 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:39:23 +10:00
Lachlan Roberts fc0f4b28f9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 15:06:09 +10:00
olivier lamy eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy 6ff39cf848 Updating to version 11.0.0-SNAPSHOT 2020-07-10 06:25:08 +10:00
olivier lamy 4c250b0f93 Updating to version 11.0.0.beta1 2020-07-10 06:25:07 +10:00
olivier lamy 9fa6a5794c Updating to version 11.0.0-SNAPSHOT 2020-07-09 16:24:52 +10:00
olivier lamy 5353ec98e0 Updating to version 11.0.0.beta0 2020-07-09 14:32:48 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Lachlan Roberts a179535db3 Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-08 18:04:36 +10:00