Commit Graph

22753 Commits

Author SHA1 Message Date
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
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
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Simone Bordet d425c9722c Improvements to the Jetty documentation.
Restructured the programming guide.
Added collapsible TOC.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 18:37:12 +01:00
Simone Bordet a495539f53 Improvements to the Jetty documentation.
Added the custom module section.
Shortened titles to better fit the TOC.
Enlarged content from 62.5em to 80em.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-19 16:50:37 +01:00
Joakim Erdfelt ea2a76ed3b Updating to version 9.4.38-SNAPSHOT 2021-02-19 09:44:28 -06:00
Joakim Erdfelt 27afab2bd3 Updating to version 9.4.37.v20210219 2021-02-19 09:03:57 -06:00
olivier lamy 5fee0123d3 restore file deleted by mistake 40b42c9388
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-19 20:56:31 +10:00
Jan Bartel 3a32a80b9c
Unify the handling of ServletContainerInitializers (#5959)
* Unify ServletContainerInitializer handling.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-19 10:20:27 +01:00
Lachlan Roberts cee44ff642 JavaxWebSocketClientContainerProvider getContainer should remain protected.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-02-19 19:56:36 +11:00
olivier lamy ddec50eb2e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2021-02-19 09:36:54 +10:00
olivier lamy 0423ad36c1 use jackson-databind 2.9.10.7
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-19 09:33:59 +10:00
Joakim Erdfelt 40b42c9388
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 16:09:11 -06:00
Joakim Erdfelt bbcae23774
Merge pull request #5494 from eclipse/jetty-9.4.x-5492-java-features-start-properties
Issue #5492 - Adding java.features.* start properties
2021-02-18 16:04:39 -06:00
Joakim Erdfelt 5f93169fcf
Correcting license headers
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-18 11:41:19 -06:00
Joakim Erdfelt 37b6acb74e
Fixing bad merge
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-18 11:39:28 -06:00
Joakim Erdfelt 91cb3c06eb
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2021-02-18 11:28:39 -06:00
Joakim Erdfelt 7abd46032b
Merge pull request #5947 from eclipse/jetty-9.4.x-dependency-ant-in-antrun
Updating ant version in our maven plugin usages
2021-02-18 11:28:03 -06:00
Joakim Erdfelt f2bed1368b
Issue #5492 - changed from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-18 11:14:54 -06:00
Joakim Erdfelt 2aa1a68079
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5492-java-features-start-properties 2021-02-18 10:55:34 -06:00