Commit Graph

22438 Commits

Author SHA1 Message Date
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
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
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
Olivier Lamy 38f0fc4c7f
Upgrade testcontainers to 1.15.1 (#5814)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-16 19:38:54 +10:00
Olivier Lamy 3730dd4064
execute isAlias test only on linux (#5813)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-16 19:38:39 +10:00
olivier lamy 5d64ba0653 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-16 18:21:33 +10:00
olivier lamy ac9b9091ac use an existing url for javadoc url
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-16 18:21:04 +10:00
Lachlan Roberts 477a6c0a10 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-15 20:58:33 +11:00
Lachlan 05ac060d7a
Merge pull request #5574 from eclipse/jetty-9.4.x-ByteAccumulator
Issue #5499 - Reduce buffer allocations and copying from ByteAccumulator
2020-12-15 20:43:34 +11:00
Lachlan Roberts c16674bae7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5706-ServerUpgradeResponse 2020-12-15 16:51:47 +11:00
Lachlan Roberts 41cffa0bc4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-15 16:49:23 +11:00
Lachlan Roberts 88a838fb17 Introduce extra enum state for DEFAULT encoding.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-15 13:40:22 +11:00
Lachlan Roberts b13fb8ad1e Resolve TODOs and other changes from review.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-15 12:21:47 +11:00
Greg Wilkins 9edbd56ffb
Temporary fix for challenged TCK test (#5803)
This is to pass the current TCK.  This has been challenged in https://github.com/eclipse-ee4j/jakartaee-tck/issues/585
2020-12-14 15:12:11 +01:00
Greg Wilkins 25ddd6e154
Fix #5794 Close socket on bind failure (#5802)
* Fix #5794 Close socket on bind failure

Fix #5794 Close socket on bind failure

* Fix #5794 Close socket on bind failure

Fix #5794 Close socket on bind failure

* Fix #5794 Close socket on bind failure

Update fix with IO.close()
2020-12-14 12:16:44 +01:00
Simone Bordet adbe5c58a1 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-14 11:21:28 +01:00
Simone Bordet 6a7410dd64
Merge pull request #5756 from eclipse/jetty-9.4.x-5755-h2client_maxDynamicTableSize
Fixes #5755 - Cannot configure maxDynamicTableSize on HTTP2Client.
2020-12-14 11:11:39 +01:00
Jan Bartel 8fd2e588a7
Issue #5763 Fix TestJettyEmbedded test (#5764)
* Issue #5763 Fix TestJettyEmbedded test

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

* Better test directory usage

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

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-14 10:19:31 +01:00
Simone Bordet db68a313cb
Merge pull request #5797 from joewitt/jetty-9.4.x
Issue #5794 ensuring serverChannel is closed in the event of a failed bind to ensure proper resources are cleaned
2020-12-14 10:13:37 +01:00
Lachlan Roberts 908acd5904 The default iso-8859-1 encoding should be set in the Content-Type.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-14 17:22:36 +11:00
olivier lamy 0c1f9636b3 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-14 09:24:17 +10:00
Olivier Lamy 9343844f15
Jetty 9.4.x spotbug issue map iteration using entrySet(), diamond list creation (#5804)
* fix some spotbug performance map iterations

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

* cannot use computeIfAbsent because it is a PathMap

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-14 08:46:35 +10:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
Greg Wilkins f17a5fb3fe
Fixes #5779 Include should not set pathInContext (#5780)
Fixes #5779 by ensuring that ContextHandler does not set pathInContext for include.
2020-12-11 10:04:31 +01:00
olivier lamy 37c040ebab use setOpaque/getOpaque i.e fixing merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 16:54:23 +10:00
olivier lamy d35e49d1c1 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 15:43:00 +10:00
olivier lamy 56ff8e8d35 force using local repository
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 15:32:41 +10:00
Joe Witt f7d4b940a2
Issue #5794 ensuring serverChannel is closed in the event of a failed bind to ensure proper resources are cleaned
Signed-off-by: Joe Witt <joewitt@apache.org>
2020-12-10 20:59:09 -07:00
olivier lamy 808a16d89e fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 12:17:31 +10:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Joakim Erdfelt a8d68360f8
Issue #5784 - Removing infinispan exclusions on license checker
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 19:55:36 -06:00