Commit Graph

22530 Commits

Author SHA1 Message Date
Simone Bordet 6e1cd862e4
Fixes #5845 - Use UTF-8 encoding for client basic auth if requested. (#5847)
* Fixes #5845 - Use UTF-8 encoding for client basic auth if requested.

* Introduced get/setCharset in BasicAuthenticator on server-side.
* Looking for the "charset" parameter on the client-side, and if there, use it.
* Added test case.
* Code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 11:26:33 +01:00
Simone Bordet 750de51974 Issue #1673 - jetty-demo/etc/keystore should not be distributed.
Updated documentation: now the test-keystore is generated on-the-fly.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 10:56:35 +01:00
Simone Bordet 7fe8d1d4ad Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 10:43:02 +01:00
Simone Bordet 17891673b1
Merge pull request #5867 from eclipse/jetty-9.4.x-5689-keyStore_absolute_path
Fixes #5689 - Jetty ssl keystorePath doesn't work with absolute path.
2021-01-12 10:07:41 +01:00
Lachlan 01c4390808
Merge pull request #5862 from eclipse/jetty-10.0.x-1673-generateTestKeystore
Issue #1673 - generate test keystore instead of distributing one
2021-01-12 17:18:24 +11:00
Lachlan Roberts 2d43661fe3 Set the javax ws upgrade request in constructor.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:47:35 +11:00
Lachlan 7aae1801e6
Merge pull request #5861 from eclipse/jetty-10.0.x-getMappings
Fix bad refactor of WebSocket getMappings method.
2021-01-12 11:17:50 +11:00
Lachlan Roberts c7d3542398 add newline at end of pom.xml file
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 11:10:11 +11:00
Simone Bordet 4081c6841a Improvements to the Jetty documentation.
Clarified that in Jetty XML's Array element the attribute "type" may also be a child element.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 19:04:09 +01:00
Simone Bordet 4080dda561 Improvements to the Jetty documentation.
Added a troubleshooting section using DEBUG logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 17:55:58 +01:00
Simone Bordet 69cf23ab28 Improvements to the Jetty documentation.
Ported the Jetty Server Dump documentation in the troubleshooting section.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 16:49:28 +01:00
Lachlan Roberts 171dfc2237 Issue #1673 - warn using test-keystore, hide bouncycastle from webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-11 23:06:17 +11:00
Simone Bordet b2f5360088 Improvements to the Jetty documentation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:31:53 +01:00
Simone Bordet 6173e001fb Improvements to the Jetty documentation.
Updated specific module documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:31:42 +01:00
Simone Bordet 26d64bd9db Improvements to the Jetty documentation.
Updated the bytebufferpool module documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:31:30 +01:00
Simone Bordet f836f87754 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-11 11:23:12 +01:00
Jan Bartel 26ef233e94
Issue #5824 Durable ConstraintMappings. (#5842)
* Issue #5824 Durable ConstraintMappings.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-11 10:30:23 +01:00
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 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
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