Simone Bordet
d7e5587eee
Fixes #5689 - Jetty ssl keystorePath doesn't work with absolute path.
...
Introduced new properties jetty.sslContext.keyStoreAbsolutePath
and jetty.sslContext.trustStoreAbsolutePath to default to
${jetty.base}/etc/keystore.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-08 21:54:04 +01:00
Lachlan Roberts
774dac66a2
Allow shutdown of Javax WS Client Container though a SCI
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 22:56:44 +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
c3e8e8d395
Rename jar to jetty-keystore, remove main from KeystoreGenerator.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 16:42:25 +11:00
Lachlan Roberts
6e6f83c7f2
Fix bad refactor of getMappings method.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-08 14:55:44 +11:00
Simone Bordet
403d5ec318
Fixes #5855 - HttpClient may not send queued requests. ( #5856 )
...
Changed the AbstractConnectionPool.acquire() logic to call tryCreate() even
when create=false.
This is necessary when e.g. a sender thread T2 with create=true steals a
connection whose creation was triggered by another sender thread T1.
In the old code, T2 did not trigger the creation of a connection, possibly
leaving a request queued.
In the new code, T2 would call tryCreate(), possibly triggering
the creation of a connection.
This change re-introduces the fact that when sending e.g. 20 requests
concurrently, 20+ connections may be created.
However, it is better to err on creating more than creating less and leaving
requests queued.
Further refactoring moved field pending from Pool to AbstractConnectionPool.
As a consequence, AbstractConnectionPool.tryCreate() now performs a
demand/supply calculation to decide whether to create a new connection.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-01-07 16:05:24 +01:00
Simone Bordet
b45c32616c
Fixes #5844 - --download flag to jetty-start causes NullPointerException.
...
Added test case, null guard and a couple small fixes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-07 12:51:06 +01:00
Lachlan Roberts
a99f8196bc
Issue #1673 - bring in bouncycastle jars with the .mod file
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-07 15:05:42 +11:00
Simone Bordet
5a28c7484a
Avoid that tests wait indefinitely.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-06 11:34:30 +01:00
Lachlan Roberts
c2b9d92a2f
Issue #1673 - generate keystore when using test-keystore module
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-06 18:07:42 +11:00
gregw
7dfb44f7ad
Revert TCK work around
...
Revert temporary fix for challenged TCK test (#5803 )
2021-01-05 13:55:33 +01:00
Greg Wilkins
51120b1f0b
Tries improvements ( #5736 )
...
* ArrayTrie handles full alphabet
* TreeTrie handles case sensitive
* improved trie selection from Index builders
* optimisations, cleanups and benchmarks.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-01-05 12:52:34 +01:00
Lachlan Roberts
f738493504
Issue #5851 - remove WebSocketServletFactory as ServletContext attribute on destroy
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-05 15:05:31 +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
65d8131144
fix incorrect test expectation
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 17:14:58 +11:00
Lachlan Roberts
69facceec3
Issue #5850 - set the UpgradeRequest in the Javax FrameHandlerFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 16:11:28 +11:00
Lachlan Roberts
af3cce85a7
The WebSocket Upgrade Header value should be all lower case.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-04 15:57:23 +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
Simone Bordet
480767a03b
Improvements to the Jetty documentation.
...
Updated the WebSocket documentation in the operations guide.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-30 20:16:20 +01:00
Simone Bordet
e341f4ca58
Merge pull request #5806 from eclipse/jetty-10.0.x-5229-WebSocketDocumentation
...
Add websocket operations-guide to Jetty 10
2020-12-30 16:53:19 +01:00
olivier lamy
05712f0c60
fix and simplify build
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-30 21:43:29 +10:00
olivier lamy
26b8912bd7
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-12-30 21:26:41 +10:00
olivier lamy
343e7b2b2a
fix build
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-30 21:25:46 +10:00
olivier lamy
9f18ad4448
this need to be in pluginMngt section
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-30 19:29:00 +10:00
olivier lamy
712027de1c
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-12-30 18:14:52 +10:00
olivier lamy
960dac2a5d
add a fast profile to quickly build everything
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-30 18:13:13 +10:00
Lachlan Roberts
cbdfaaa335
fix licence header from merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-28 16:28:31 +11:00
Lachlan Roberts
e340227066
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-12-28 16:27:29 +11:00
Lachlan
3d11d4e071
Merge pull request #5789 from eclipse/jetty-9.4.x-5783-ConnectionStatisticsRates
...
Fix the calculation of rates in ConnectionStatistics
2020-12-28 16:26:55 +11:00
Jan Bartel
84cff978ee
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-12-24 15:54:48 +01:00
Jan Bartel
29c00ebdf5
Issue #5725 Review preventers. ( #5839 )
...
Note that any Preventer that is documented as being fixed prior to jdk11
should be deleted from jetty-10/11 when this change is merged through.
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-12-24 15:29:31 +01:00
Lachlan Roberts
3286f9a454
Issue #5832 - changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-24 13:59:45 +11:00
Lachlan Roberts
7a72a6ac64
Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 17:14:12 +11:00
Lachlan Roberts
dd1d4bc1ca
Issue #5832 - use lifeCycleStopping as lifeCycleStopped is never called
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 11:45:09 +11:00
Lachlan Roberts
25f8c65539
Issue #5832 - shutdown WSClientContainer with ContextHandler if possible
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-23 11:36:18 +11:00
Lachlan Roberts
374e02cbc3
register ShutdownThread in doStart
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-22 15:53:10 +11:00
Lachlan Roberts
97bbec7ac0
Issue #5832 - deregister ShutdownThread for WebSocketClientContainer
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-22 11:25:37 +11:00
Olivier Lamy
06df421b56
Remove javax.* dependencies ( #5776 )
...
remove non needed enforcer rule in websocket poms
force search transitive
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-22 08:17:16 +10:00
Lachlan
65a908b65d
Merge pull request #5807 from eclipse/jetty-10.0.x-5757-Charsets
...
Cleanup of charset usage in Response
2020-12-21 16:09:49 +11:00
Lachlan Roberts
4e9e9b8d19
Remove the total count from the RateCounter.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-21 15:55:54 +11:00
Lachlan
cf0b65ec29
Merge pull request #5768 from eclipse/jetty-10.0.x-5706-ServerUpgradeResponse
...
Issue #5706 - fix potential NPE from websocket-core ServerUpgradeResponse
2020-12-21 14:50:48 +11:00
Ravi Kumar
be8d57e3cb
replaced the missed set() call
...
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-18 18:31:41 +05:30
Ravi Kumar
69a2558883
fixed the getTasks method and replaced the usage of deprecated set method
...
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-18 17:54:09 +05:30
Simone Bordet
ea24a8146d
Merge pull request #5821 from rk1165/issue_5816
...
Fixes #5816 : JMX-ify Scheduler implementations
2020-12-18 09:53:02 +01:00
Lachlan
5611c2daa2
Merge pull request #5790 from eclipse/jetty-9.4.x-5785-WebSocketWarning
...
remove warning log message on CompressExtension failure
2020-12-18 18:11:47 +11:00
Ravi Kumar
433f612793
Made changes as per the review comments
...
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-18 08:31:04 +05:30
Ravi Kumar
a4dc95aa79
Added JMX annotations for ScheduledExecutorScheduler
...
Signed-off-by: Ravi Kumar <kumarravi1165@gmail.com>
2020-12-17 21:27:03 +05:30
Ludovic Orban
d5648c73a1
Merge pull request #5820 from eclipse/jetty-9.4.x-5819-PoolArithmeticException
...
backport fix for ArithmeticException in Pool
2020-12-17 16:26:12 +01:00
Ludovic Orban
447823316d
backport fix for ArithmeticException
2020-12-17 14:16:42 +01:00
olivier lamy
6769a83d3d
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-12-16 20:03:28 +10:00