Commit Graph

3908 Commits

Author SHA1 Message Date
Lachlan Roberts 458e42e7d6 add getter for the WebSocketUpgradeHandler configuration
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-08-17 21:55:13 +10:00
Lachlan Roberts 030978d192 remove check for isOutputOpen and ignore failure in callback.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-08-04 07:44:37 +10:00
Lachlan Roberts 8a8bc4e45b Issue #8353 - do not attempt to send pong frame after output closed
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-29 16:45:46 +10:00
Olivier Lamy 9149945945
simplify pom by using simple property rather than xml fragment (#7580)
* simplify pom by using simple property rather than xml fragment

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-14 09:42:28 +10:00
Greg Wilkins 2b817f06c6
Combined ByteBufferPool (#8171)
All `ByteBufferPool` can now be accessed as `RetainableByteBufferPools`.

Users now need to configure only a single buffer pool and there is just the additional retained parameter that needs consideration.
Default buffer pool has been changed to logarithmic, but we may wish to review that before next release.
Default factor size has been increased to 4096.
2022-07-04 10:38:30 +10:00
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
Joakim Erdfelt c5a33e27d2
Issue #5684 - Windows test overhaul (#6581)
Issue #5684 - Window's test overhaul

+ Migrate from @DisabledOnOs(WINDOWS) to assumptions on capabilities instead.
+ Fix other outstanding windows testing issues.
+ Cleanup FileBufferedResponseHandlerTest expectations on Windows.
+ PathWatcher scan interval is variable on windows
+ If unable to start testcase based on assumption,
  the stop shouldn't fail testcase
+ Increase various wait timeouts
+ Make tests less strict due to system speed issues
+ Disable Sni tests due to TLS behaviors differences in Windows
  + Windows TLSv1.3 seems to introduce this difference
  + If we restrict to TLSv1.2 this passes.
  + On Linux TLSv.13 on client side will always return a
  + javax.net.ssl.SSLHandshakeException in those test cases that expect it.
  + However, on Windows, Only the TLSv1.2 implementation will return a javax.net.ssl.SSLHandshakeException,
  + All other TLS versions on Windows will result in a
  + javax.net.ssl.SSLException: Software caused connection abort: recv failed
+ Disable ConcurrentStreamCreationTest
  + Not possible to create all of these streams.
+ Fixing DeploymentTempDirTest
  + Using unique workdir per testcase.
  + Don't expect to delete files / directories between tests
    (not supported on windows due to file locking anyway)
 + Fixing line ending difference on windows
 + InvalidPathException is a 404 Not Found
 + Cannot reuse test directory between runs due to memory mapped files that are still in use from previous run.
 + java.nio.file.FileSystemException: C:\code\jetty.project\jetty-webapp\target\tests\welcome#\index.html: The requested operation cannot be performed on a file with a user-mapped section open.

	at java.base/sun.nio.fs.WindowsException.translateToIOException(WindowsException.java:92)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:103)
	at java.base/sun.nio.fs.WindowsException.rethrowAsIOException(WindowsException.java:108)
	at java.base/sun.nio.fs.WindowsFileSystemProvider.newByteChannel(WindowsFileSystemProvider.java:235)
	at java.base/java.nio.file.spi.FileSystemProvider.newOutputStream(FileSystemProvider.java:478)
	at java.base/java.nio.file.Files.newOutputStream(Files.java:220)
	at org.eclipse.jetty.webapp/org.eclipse.jetty.webapp.WebAppDefaultServletTest.prepareServer(WebAppDefaultServletTest.java:84)

 + As is typical on windows, we are often unable to delete a file due to file locking issues.
 + Use a unique resource base between tests.
   This is to avoid file locking behaviors that prevent the
   resource base from being reused too quickly on windows.
 + Prevent test run if symlinks not supported
 + Allowing for Windows slosh char as well in asserts
 + SelectorUtils is File.separator dependent
 + Regex is now FS.separator independent
 + Using SelectorUtils from plexus correctly for include/exclude
 + Turning off mapped files for testing reasons.
 + Fix and re-enable RFC2616NIOHttpsTest
 + Issue #6552 - Fix test failures due to slf4j dep
 + Issue #6552 - upgrade testcontainers
 + Issue #6552 - move to assumption based docker existence
 + Issue #6552 - Fix enforcer rule violation on jna.
  Addresses the following side effect of upgrading testcontainers.

[WARNING] Rule 3: org.apache.maven.plugins.enforcer.RequireUpperBoundDeps failed with message:
Failed while enforcing RequireUpperBoundDeps. The error(s) are [
Require upper bound dependencies error for net.java.dev.jna:jna:5.6.0 paths to dependency are:
+-org.eclipse.jetty:infinispan-remote-query:10.0.7-SNAPSHOT
  +-org.testcontainers:testcontainers:1.16.0
    +-com.github.docker-java:docker-java-transport-zerodep:3.2.11
      +-net.java.dev.jna:jna:5.6.0 (managed) <-- net.java.dev.jna:jna:5.8.0

 + use annotation to disable test when docker not available and needed
 + Disabling FileSessionDistributionTests.stopRestartWebappTestSessionContentSaved on Windows
 + Using TLS basic
 + Programmatic removal of memory mapped behavior during testing
 + Fixing slf4j warning

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-08-26 11:26:46 -05:00
Lachlan Roberts 83f2265653 Issue #6642 - never shutdown output after generating a request.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-26 14:18:28 +10:00
Joakim Erdfelt a82b45c5fb
Issue #6654 - Fix NPEs from bad Servlet API use
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-08-24 09:05:47 -05:00
Lachlan Roberts f7d9d8fcf8 Issue #6642 - prevent connection close after websocket upgrade
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-24 19:39:34 +10:00
Lachlan Roberts fd6c72c668 Issue #6566 - do not duplicate size count for binary MessageSinks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-24 10:55:47 +10:00
Lachlan Roberts 0fc025d526 Issue #6642 - add tests for WebSocket Connection Headers.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-24 10:37:18 +10:00
Joakim Erdfelt 32e6698f0b
Issue #6654 - Fix NPEs from bad Servlet API use
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-08-23 16:01:32 -05:00
Joakim Erdfelt 401f1959d2
Issue #6654 - Fix NPEs from bad Servlet API use
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-08-23 11:38:15 -05:00
Lachlan Roberts bd396f867b Fix some more unstable tests.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-19 20:43:13 +10:00
Lachlan Roberts 026261f482 Issue #6566 - use counter in BufferCallbackAccumulator, fix InputStreamMessageSinkTest failures
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 17:10:12 +10:00
Lachlan Roberts 65ff0bb081 Fix broken test in OutgoingMessageCapture.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 13:15:16 +10:00
Lachlan Roberts 5236e47c42 Issue #6566 - utilise the demand interface in the websocket MessageSinks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 11:04:14 +10:00
Lachlan Roberts d3dfe353be Expose the isInputOpen() method in CoreSession interface.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-18 11:00:39 +10:00
Lachlan Roberts 646707b85c Issue #6602 - do not invoke SessionListener onOpen if session has been closed in OnOpen
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-12 15:50:25 +10:00
Lachlan Roberts edec52893b Add name on WebSocketComponents default threadpool
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 16:49:15 +10:00
Lachlan Roberts 316c46675e Fix WebSocketComponents LifeCycle in AbstractJavaxWebSocketFrameHandlerTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 16:19:34 +10:00
Lachlan Roberts de8cbcf588 Fix broken tests using WebSocketComponents
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 15:11:35 +10:00
Lachlan Roberts 14c09e3c98 Issue #6566 - fix WebSocketComponents LifeCycle issue
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 13:28:10 +10:00
Lachlan Roberts bbabaee8cc Issue #6566 - add executor to WebSocketComponents & use for Dispatched Messages
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-08-04 11:24:10 +10:00
Ludovic Orban c9a5d8df58 #6322 Use RetainableByteBuffer and write a new pool for it
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-07-24 11:14:21 +02:00
Joakim Erdfelt c245a70893 Updating to version 10.0.7-SNAPSHOT 2021-06-29 10:51:22 -05:00
Joakim Erdfelt 37e7731b4b Updating to version 10.0.6 2021-06-29 10:27:56 -05:00
Lachlan 1cd0093855
Merge pull request #6411 from eclipse/jetty-10.0.x-6407-ClientUpgradeRequestUri
Issue #6407 - Fix URI validation for WebSocket ClientUpgradeRequest
2021-06-23 10:37:58 +10:00
Jan Bartel 2c2781a73e
Jetty 10.0.x 6423 service provider osgi headers (#6424)
* Issue #6423 Add headers to jetty manifests to expose o.e.j.w.Configuration for osgi ServiceLoader.

 Add jetty-annotations manifest to expose o.e.j.w.Configuration  to ServiceLoader. 
 Add osgi headers to jetty-quickstart for o.e.j.w.Configuration
 Add osgi serviceloader headers for jetty-cdi
 Add osgi serviceloader headers to websocket-jetty-client
 Add osgi serviceloader headers to jetty-ant
  Add osgi serviceloader headers to websocket-javax-client
 Add osgi serviceloader headers for websocket-jetty-common
 Add osgi serviceloader headers for websocket-core-common

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-23 08:32:21 +10:00
Simone Bordet b8d6e3f010
Fixes #6410 - Use SocketAddress instead of InetSocketAddress. (#6414)
* Fixes #6410 - Use SocketAddress instead of InetSocketAddress.

Removed usages of InetSocketAddress in method signatures where possible.
Deprecated old methods, and added new methods with SocketAddress.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-17 10:18:08 +02:00
Lachlan Roberts 402d79f59a fix javadoc for ClientUpgradeRequest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-16 01:00:45 +10:00
Lachlan Roberts 10ed23f22d add javadoc and null check for HttpScheme
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-16 00:40:35 +10:00
Lachlan Roberts 148cf38c5d Issue #6407 - fix logic in ClientUpgradeRequest(URI) constructor and deprecate it
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-15 18:47:20 +10:00
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Lachlan 6dea0251c2
Issue #4772 - support partial messages for Jetty WS API annotations (#6357)
* Issue #4772 - support partial messages for Jetty WS API annotations

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-10 16:05:54 +02:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Lachlan cd73338b84
Remove WebSocketComponents & HouseKeeper on Server restart. (#6218)
* Remove WebSocketComponents & HouseKeeper on Server restart.
* Add testing for cleanup of websocket when stopping server.
* Add removeFilterHolder and removeFilterMapping methods on ServletHandler.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-20 14:48:23 +02:00
Lachlan Roberts 0761aee75a Disable websocketProvidedByWebApp on JDK14-15 due to JDK-8244090 bug.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-20 01:17:42 +10:00
Lachlan Roberts 779cf4ccbc Issue #6287 - improve testing & changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-19 11:24:15 +10:00
Lachlan Roberts d7c42bb49a Issue #6287 - fix classloading for WebSocketClient in webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-18 17:51:26 +10:00
Lachlan f828411c16
Merge pull request #6119 from eclipse/jetty-10.0.x-6106-WebSocketCDI
Issue #6106 - Fix WebSocket/CDI integration in Jetty 10
2021-04-30 14:21:14 +10:00
Simone Bordet 8b10f3ebd5 Documented WebSocketClient.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-27 11:04:42 +02:00
Lachlan Roberts a0cca858a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6106-WebSocketCDI 2021-04-27 16:15:52 +10:00
Lachlan Roberts ce8ede5c71 Use correct logger in AvailableEncoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-27 10:38:42 +10:00
Lachlan Roberts 5b13006a59 Make AvailableEncoders & AvailableDecoders implement Closable.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 21:46:28 +10:00
Lachlan Roberts ab08d1a1c6 Ensure that javax.websocket Encoder/Decoder destroy method is called.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-20 11:11:05 +10:00
Lachlan dab26c601d
Merge pull request #6170 from eclipse/jetty-10.0.x-6166-MessageInputStream
Issue #6166 - fix bug in the MessageInputStream byte array read
2021-04-15 20:16:06 +10:00