Commit Graph

3853 Commits

Author SHA1 Message Date
Lachlan 8e0ccad495
Merge pull request #8176 from eclipse/jetty-10.0.x-8170-WebSocketHttp2Close
Issue #8170 - fix WebSocket close over HTTP/2
2022-06-29 17:12:12 +10:00
Lachlan 13c61684fe
Merge pull request #8164 from eclipse/jetty-10.0.x-8151-websocketClose
Issue #8151 - make websocket close non-blocking
2022-06-29 16:30:27 +10:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194)
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
2022-06-22 16:24:48 -05:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180)
* Updating to version 10.0.11-SNAPSHOT
2022-06-21 14:41:41 +02:00
Lachlan Roberts 4d217cd75b Issue #8151 - add close with callback to Jetty WebSocket API
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-17 18:17:49 +10:00
Lachlan Roberts e4b0db8666 Issue #8170 - fix WebSocket close over HTTP/2
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-17 15:28:16 +10:00
Joakim Erdfelt d63569d025
Migrate code from jetty-util Logger to slf4j Logger (#8162)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-06-15 20:01:48 +02:00
Lachlan Roberts ed541d344c Issue #8151 - make websocket close non-blocking
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-14 16:43:59 +10:00
Lachlan 0699bc5326
Use static exceptions for closing websocket flushers and in ContentProducer (#8155)
* Use StaticException class in jetty-util for websocket flushers.
* Use StaticException class for ContentProducer recycle and consumeAll

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2022-06-13 14:11:31 +02:00
Lachlan b1c19c0b0f
Merge pull request #8134 from eclipse/jetty-10.0.x-websocketPermessageDeflatePools
Improve cleanup of deflater/inflater pools for PerMessageDeflateExtension
2022-06-10 09:43:23 +10:00
Lachlan Roberts 3901159093 remove IOException from Extension.close() interface.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-09 08:12:06 +10:00
Joakim Erdfelt 8de55150fe
Cherry-pick of Improvements to PathSpec for Jetty 10.0.x (#8136)
* Cherry-pick of Improvements to PathSpec.
* From commit: 5b4d1dd1c6
* Fixing ConstraintSecurityHandler usage of PathMappings
* Fixing bad INCLUDE logic from cherry-pick in ServletHandler.doScope()
* Cleanup of non ServletPathSpec behaviors in ServletPathMapping class
* Skip optional group name/info lookup if regex fails.
* Prevent NPE on static servletPathMappings
* Update WebSocketMappings to use new PathMappings.getMatched(String)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-06-08 12:36:30 -05:00
Lachlan Roberts f4c54f4571 remove close to incomingFlusher in PerMessageDeflateExtension
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-08 10:49:23 +10:00
Lachlan Roberts e578791518 Changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-08 10:44:17 +10:00
Lachlan Roberts 5a24f90064 Improve cleanup of deflater/inflater pools for PerMessageDeflateExtension
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-06-07 18:52:48 +10:00
Lachlan Roberts a93896b22f Issue #7977 - prevent possible NPE from UpgradeHttpServletRequest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-05-12 16:10:15 +10:00
dependabot[bot] c2c1ea8d9a
Bump maven-bundle-plugin from 5.1.4 to 5.1.5 (#7933)
* Bump maven-bundle-plugin from 5.1.4 to 5.1.5

Bumps maven-bundle-plugin from 5.1.4 to 5.1.5.

---
updated-dependencies:
- dependency-name: org.apache.felix:maven-bundle-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* Standardize maven-bundle-plugin usage (to avoid build error)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-05-06 16:24:40 -05:00
Joakim Erdfelt 16420f0181
Set version to `10.0.10-SNAPSHOT` (#7823)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-04-03 20:33:44 +10:00
Joakim Erdfelt f079949a35
Merge Release 10.0.9 (#7821)
* Updating to version 10.0.9

* Updating to version 10.0.10
2022-04-02 08:43:44 -05:00
Lachlan Roberts 7081a776b7 Issue #7573 - fix support in websocket for class path param types
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-02-14 16:37:57 +11:00
Simone Bordet a4fda96f49
Updating to version 10.0.9-SNAPSHOT 2022-02-07 12:02:02 +01:00
Simone Bordet 716c7afd8e
Updating to version 10.0.8 2022-02-07 11:34:12 +01:00
Lachlan b0e334f14a
Run WebSocket Autobahn test for all Jetty, Javax and Core APIs (#7430)
* Run WebSocket Autobahn test for all Jetty, Javax and Core APIs

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

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-01-31 15:29:41 +10:00
Joakim Erdfelt cb127793e5
Happy New Year 2022 (#7459)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-01-27 10:42:30 -06:00
Lachlan 2b41e4d231
Issue #7351 - large WebSocket payloads with permessage-deflate hang (#7360)
PerMessageDeflateExtension and FragmentExtensions now intercept demand for incoming frames. These extensions may fragment a single frame into many frames, so they must wait until a new frame has been demanded before forwarding the next synthetic frame to the application.
2022-01-19 10:47:45 +11:00
Lachlan Roberts ab5c72f14f Fix possible NPEs from WebSocketAdapter
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-12-16 18:31:57 +11:00
Lachlan 33c9536d12
Merge pull request #7058 from eclipse/jetty-10.0.x-2504-WebSocketDump
Issue #2504 - expose more WebSocket details in jetty server dump
2021-12-02 19:55:50 +11:00
Lachlan Roberts d8bcac7767 use Matchers.equalTo instead of Matchers.is
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-11-12 21:37:15 +11:00
Lachlan Roberts 750ee0a182 Issue #7086 - Fix test failure in WebSocketOpenTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-11-10 10:28:48 +11:00
Lachlan Roberts bd42cc1ebd Issue #7086 - add test for failures from WebSocketCoreSession.demand()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-11-09 12:15:49 +11:00
Lachlan Roberts 6b6452a519 Issue #7086 - Demand should not throw if the WebSocket session is closed.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-11-09 10:37:44 +11:00
Lachlan Roberts 370db7ad34 Demand even if no message sink in JavaxWebSocketFrameHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-11-08 21:28:10 +11:00
Lachlan Roberts bd7f1b114e Issue #2504 - expose more WebSocket details in jetty server dump
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-10-29 14:26:38 +11:00
Lachlan 366cb7ffc0
Merge pull request #6968 from eclipse/jetty-10.0.x-6965-WebSocketProgrammaticUpgrade
Issue #6965 - support programmatic upgrade for javax/jakarta websockets (10)
2021-10-21 17:23:08 +11:00
Lachlan Roberts 5811b042b1 Issue #6965 - support programmatic upgrade for javax/jakarta websockets
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-10-07 14:22:36 +11:00
Joakim Erdfelt cfc67f86d2 Updating to version 10.0.8-SNAPSHOT 2021-10-06 14:51:32 -05:00
Joakim Erdfelt da8a4553af Updating to version 10.0.7 2021-10-06 14:32:37 -05:00
Simone Bordet 0412bdc3d9 Fixes #6938 - module-info.java file do not use the canonical order for the elements
Changed order of entries in module-info.java to be canonical

(cherry picked from commit 02691171d5)
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-10-01 09:25:55 +02:00
Olivier Lamy 51d44a3401
use dependencyManagement for internal dependencies (#6940)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-30 16:57:19 +10:00
Joakim Erdfelt 8dd62838f7
Initial cleanup / reorg of dependencies
+ All plugins and dependencies are alphabetized now
+ All plugins and dependency versions have properties now

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-09-22 09:54:52 -05:00
Simone Bordet 4793092f9d
Fixes #5229 - WebSocket documentation. (#6623)
Added WebSocket server-side documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-09-15 19:42:27 +02:00
dependabot[bot] b44dde6098
Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0 (#6755)
* Bump maven-enforcer-plugin from 3.0.0-M3 to 3.0.0

Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.0.0-M3 to 3.0.0.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.0.0-M3...enforcer-3.0.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

* fix some upper bound issues and exclude more javax

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

* fix upperbound dependencies issue with enforcer plugin upgrade

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

* exclude this wrong which makes enforcer plugin fail and btw it's not used

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

* fix last enforcer upperbound issues

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-09-14 06:10:48 +10:00
Lachlan Roberts 2aa966a854 Issue #6696 - change method name to WebSocketNegotiation.upgrade()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-09-07 10:19:51 +10:00
Lachlan Roberts d41a297352 Issue #6696 - don't keep Request object in the WebSocketNegotiation after upgrade
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-09-06 17:14:53 +10:00
Lachlan dff5e14bb5
Merge pull request #6680 from eclipse/jetty-10.0.x-6601-WebSocketJPMS
Issue #6601 - fix JPMS issues for websocket-core-common
2021-09-02 10:24:08 +10:00
Lachlan 0a78b9845d
Merge pull request #6657 from eclipse/jetty-10.0.x-6642-WebSocketConnectionHeaders
Issue #6642 - WebSocket handling of Connection: upgrade,close.
2021-08-31 14:25:47 +10:00
Lachlan Roberts 763820e111 ByteBufferCallbackAccumulator.writeTo should do buffer flipping
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-30 14:58:16 +10:00
Lachlan Roberts ead1f6b160 Issue #6601 - export websocket-core-common to jetty-util for DecoratedObjectFactory
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-30 11:43:54 +10:00
Lachlan Roberts 7569e4b07a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6566-WebSocketMessageSinks 2021-08-27 17:21:53 +10:00
Lachlan Roberts 1dce9df48d Issue #6566 - cleanups of ByteBufferCallbackAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-27 11:49:18 +10:00