Commit Graph

22822 Commits

Author SHA1 Message Date
Simone Bordet 217a97b952 Fixes #6037 - Review logging modules for j.u.l.
Fixed mistakes in logging-jul-capture.mod.
Introduced java-util-logging-bridge.properties for the bridge module configuration.
Added [exec] sections to specify the jul config file.
Removed logging-jul-capture.xml, not necessary.
Added tests to verify that the fixed modules work fine.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-05 19:18:19 +01:00
Lachlan Roberts 08c4ce14ab Issue #6008 - fix RequestLog usage with filePath.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-04 11:19:14 +11:00
Joakim Erdfelt 2710f22e53
Issue #6028 - Adding test of Request.getContextPath() for root context
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 15:04:41 -06:00
Joakim Erdfelt 82a50727d8
Issue #6026 - Cleaning up uncovered HTTP methods warning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 14:40:46 -06:00
Joakim Erdfelt 1cb0a4978f
Merge pull request #6022 from eclipse/jetty-10.0.x-better-xml-path-resolution
Issue #6021 - PoC for resolvePath within XmlConfiguration
2021-03-03 12:24:25 -08:00
Joakim Erdfelt 6d2ea3d5da
Issue #6021 - Addressing defaults
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 09:41:41 -06:00
Joakim Erdfelt 40e9cd08e1
Issue #6021 - Addressing naming
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:39:15 -06:00
Joakim Erdfelt 48d296ac0c
Issue #6021 - Addressing naming
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:38:15 -06:00
Joakim Erdfelt 9de2c2096b
Issue #6021 - Simpler resolvePath
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:29:18 -06:00
Joakim Erdfelt e34c1cc312
Issue #6021 - Tabs vs Spaces
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 08:28:04 -06:00
Joakim Erdfelt 3a457a15d1
Issue #6021 - More windows specific test cases
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 07:22:24 -06:00
Joakim Erdfelt 87f7530834 Issue #6021 - Addressing expectations on Windows
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 04:23:33 -08:00
Joakim Erdfelt 021451cba9
Issue #6021 - Adding windows specific testcases
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-03 06:15:30 -06:00
Lachlan 23c1ef3ae9
Merge pull request #6025 from eclipse/jetty-10.0.x-6024-JavaxShutdownContainerError
Issue #6024 - protect and expose the JavaxWebSocketShutdownContainer.
2021-03-03 22:36:57 +11:00
Jan Bartel 9d40a754aa Use EXTERNAL mode for jetty-maven-plugin test.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:35:52 +01:00
Jan Bartel 76580d537a
Fix move from DISTRO to HOME for jetty-maven-plugin mode (#5991)
* Use mode EXTERNAL rather than HOME or DISTRO

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:28:53 +01:00
Jan Bartel 599b4762b9
Issue #6011 Fix configurations in jetty.xml baked into org.eclipse.jetty.osgi.boot (#6012)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-03 11:16:22 +01:00
Lachlan Roberts 7a453b44d0 Issue #6024 - protect and expose the JavaxWebSocketShutdownContainer.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-03 17:38:27 +11:00
Joakim Erdfelt 927dc60983
Issue #6021 - Fixing test case
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-02 14:53:58 -06:00
Joakim Erdfelt 613e0ecd54
Issue #6021 - PoC for resolvePath within XmlConfiguration
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-02 14:40:36 -06:00
Greg Wilkins 06e1a7e88d
URI compliance modes for #6001 (#6006)
* Fix #4275 separate compliance modes for ambiguous URI segments and separators

default modes allows both ambiguous separators and segments, but still forbids ambiguous parameters

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-02 11:59:16 +01:00
Lachlan d9eefc9231
Merge pull request #5840 from eclipse/jetty-10.0.x-5832-WebSocketShutdownThread
Issue #5832 - shutdown Javax WSClientContainer with webapp if possible.
2021-03-01 16:00:15 +11:00
gregw c6712cf592 updated CVE
Signed-off-by: gregw <gregw@webtide.com>
2021-02-27 09:25:50 +01:00
gregw 18422d6b42 updated CVE
Signed-off-by: gregw <gregw@webtide.com>
2021-02-27 09:24:28 +01:00
Chris Walker ff8cf93efd
Update Version.txt with CVEs (#6014)
Adds CVEs to Version.txt
2021-02-25 14:56:11 -06:00
gregw 2001f9f963 fixed bad merge 2021-02-24 12:33:29 +01:00
gregw c4dbf9748e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-24 11:58:55 +01:00
Greg Wilkins 49e73dfb75
Fix #4275 #6001 separate compliance modes for ambiguous URI segments and se… (#6003)
Fix #4275 separate compliance modes for ambiguous URI segments and separators
2021-02-24 10:05:05 +01:00
Simone Bordet bffa62af23 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-24 09:39:19 +01:00
Simone Bordet c9cd1e4758
Merge pull request #5995 from eclipse/jetty-9.4.x-5994-qtp_free_threads
Fixes #5994 - QueuedThreadPool "free" threads
2021-02-24 09:31:03 +01:00
Joakim Erdfelt fa6c617069
Fixing checkstyle warning
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-23 16:28:09 -06:00
gregw bc3e1dc94e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-23 20:06:30 +01:00
Greg Wilkins 8bd4a9fad8
Fix #5999 ArrayIndexOutOfBounds for unicode in HttpURI segment (#6000)
Fixed ArrayTrie to not throw if passed a unicode character.
2021-02-23 20:03:45 +01:00
Simone Bordet 530c14e7b3 Issue #5994 - QueuedThreadPool "free" threads
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-23 18:12:55 +01:00
gregw 522bb4e3e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-23 13:10:00 +01:00
gregw 8ea5b47a3b Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-23 13:09:28 +01:00
gregw 16241d7fcb Efficiency improvements for #5977
Improve efficiency for non wrapped response for cache-contro
2021-02-23 13:09:02 +01:00
gregw 3100f2c158 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2021-02-23 13:07:56 +01:00
gregw fdb54fa2fb Efficiency improvements for #5977
Improve efficiency for non wrapped response for cache-contro
2021-02-23 13:06:50 +01:00
Greg Wilkins c0b0f80567
Efficiency improvements for #5977 (#5998)
Improve efficiency for non wrapped response for cache-contro
2021-02-23 12:56:22 +01:00
olivier lamy 0f32e264a2 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-23 10:38:05 +10:00
olivier lamy b836c2fda3 add test for fix containsHeader test when it is not instance of Response, Issue #5977 was partially fixed
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-23 10:32:00 +10:00
olivier lamy 38ef4009b9 fix containsHeader test when it is not instance of Response, Issue #5977 was partially fixed
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-23 10:01:53 +10:00
Simone Bordet 64e01beeeb Fixes #5994 - QueuedThreadPool "free" threads
Introduced to QueuedThreadPool:

* getMaxReservedThreads()
* getAvailableReservedThreads()
* getAvailableThreads()
* getReadyThreads()
* getLeasedThreads()

Also few small code cleanups.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-22 23:02:12 +01:00
Joakim Erdfelt 9effce7558
Merge remote-tracking branch 'origin/release-10.0.1' into jetty-10.0.x 2021-02-22 11:17:22 -06:00
Joakim Erdfelt 08b4487363
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-22 11:16:53 -06:00
Lachlan Roberts 47f24db0be Issue #5832 - Improve testing for WebSocket client shutdown.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 21:12:57 +11:00
Lachlan Roberts ed86361581 Revert changes to ServletContainerInitializer
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 10:03:43 +11:00
Lachlan Roberts 7760d04a87 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5832-WebSocketShutdownThread
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-22 09:53:31 +11:00
Lachlan 4d67b30785
Merge pull request #5952 from eclipse/jetty-10.0.x-5828-JavaxWebSocketHttpClient
Issue #5828 - allow HttpClient to be used with JavaxWebSocketClientContainerProvider
2021-02-22 09:41:34 +11:00