22512 Commits

Author SHA1 Message Date
Lachlan Roberts
29f185931e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5832-WebSocketShutdownThread 2021-01-18 16:01:18 +11:00
Simone Bordet
e1f62c4905 Issue #5799 - Allow specifying the duration an object can stay in a pool.
Fixed AbstractConnectionPool.accept() to wrap the entry into an EntryHolder.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-14 20:09:15 +01:00
Lachlan Roberts
2f6176661a improve testing for JavaxWebSocketClientContainer shutdown
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-14 14:38:12 +11:00
Jan Bartel
87a2cc2698 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-13 22:41:32 +01:00
Jan Bartel
b99eb3f76c
Issue #5684 Fix and re-enable ServletRequestLogTest. (#5877)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-13 22:35:36 +01:00
Lachlan Roberts
35051dfde5 Issue #5832 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-13 17:54:30 +11:00
Lachlan
16acdcf7e9
Merge pull request #5852 from eclipse/jetty-10.0.x-5850-UpgradeRequestNPE
Fix NPE from WebSocketSession.getUserPrincipal() in Jetty10
2021-01-13 12:01:24 +11:00
Jan Bartel
51709dce9d Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 17:50:22 +01:00
Jan Bartel
a5a8327a1e
Issue #5684 Fix testSetBadBoolean and remove @Disabled (#5875)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 17:48:37 +01:00
Simone Bordet
4b775525ff Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 17:16:47 +01:00
Simone Bordet
03ec5bb773
Merge pull request #5825 from rk1165/issue_5786
Issue #5786 : Revisit Statistics classes
2021-01-12 17:15:44 +01:00
Jan Bartel
8cd0d45ed0 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 16:52:47 +01:00
Ludovic Orban
e9832492b3 Add missing files to previous merge of remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:31:13 +01:00
Ludovic Orban
058a488c30 Merge remote-tracking branch origin/jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-01-12 16:22:11 +01:00
Jan Bartel
46031c225a Re-enable PathWatcherTest after fix for 5830
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 16:13:50 +01:00
Jan Bartel
395645aaef Clarify reason for Disabled annotation on test classes.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 15:45:08 +01:00
Ludovic Orban
ba5ba010b8
Merge pull request #5801 from eclipse/jetty-9.4.x-5799-pool-max-duration2
Implement max duration of HTTP ConnectionPools
2021-01-12 15:42:32 +01:00
Ludovic Orban
0dec883fda implement connection pool max duration 2021-01-12 15:41:56 +01:00
Jan Bartel
f16e3c965b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:22:50 +01:00
Jan Bartel
03ae75f407 Add reason for @Disabled.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 12:20:28 +01:00
Jan Bartel
a36f8d2819 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:15:50 +01:00
Jan Bartel
2adea58037 Remove old comment from JdbcLoginServiceTest
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 12:14:56 +01:00
Jan Bartel
34f71cf036 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 12:00:38 +01:00
Jan Bartel
e1e16ae54b
Issue #5870 Windows URI case comparison fails (#5873)
* Issue #5870 Windows URI case comparison fails

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

* Issue #5870 - Updating Windows tests

+ Eliminating OS.MAC (as it doesn't support drive letters)
+ Adding alt URI syntax version as well

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-12 11:44:56 +01:00
Jan Bartel
798337a3f6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-01-12 11:39:17 +01:00
Jan Bartel
1a7c3deb09
Issue #5830 Remove com.sun.nio.file import. (#5838)
* Issue #5830 Remove native classes from PathWatcher.

Removed use of com.sun.nio.file.SensitivityWatchEventModifier, no longer needed.
This has the desirable side-effect of getting rid of com.sun.nio.file package imports.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-01-12 11:30:04 +01:00
Simone Bordet
847e8c612f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-12 11:30:00 +01:00
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
9e19e875f5 Issue #5832 - deprecate and remove usage of the ContainerInitializer utility
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-01-12 17:08:53 +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
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
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