Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
24,740 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

3742 Commits

Author SHA1 Message Date
Greg Wilkins a5b1845e60
Disable ipv6 test for #6624 (#6625) (#6629) 
Temp disable of test that is breaking the build.
 2021-08-17 16:15:00 +10:00
Ludovic Orban 7e39d5434a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:56:01 +02:00
Ludovic Orban 7867d51c91 #6327 replace Await helper with awaitility 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-08-12 10:47:24 +02:00
Jan Bartel 2c4d8dd042 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-08-02 10:06:38 +10:00
Jan Bartel 90a72b0798
Issue #6556 Ensure context classloader set when operating on memcache. (#6557) 
* Issue #6556 Ensure context classloader set when operating on memcache.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-08-02 10:04:51 +10:00
Greg Wilkins 19784aa5c0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-30 09:09:55 +10:00
Greg Wilkins 6201d3b107
Non blocking ReservedThreadExecutor (#6535) (#6559) 
A call to offer must never block, nor even yield, since to do so give an opportunity for the allocated CPU core to change, defeating the whole purpose of the class.
There is also some reasonable level of diagnostic warnings if a reserved thread misses too many offers consecutively, based on tracking the state of the reserved thread.

Remove the stack data structure entirely.  ReservedThreads all poll the same SynchronousQueue and tryExecute does a non blocking offer.

Added test for busy shrinking

Remember last time we hit zero reserved threads

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2021-07-30 09:08:36 +10:00
Ludovic Orban aeeed200dc Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-07-29 11:17:09 +02:00
Ludovic Orban d8a890f71e #6541 improve testConcurrentAccess perf 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-07-29 11:11:54 +02:00
Ludovic Orban 9e047ab412 #6541 improve testTake perf 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-07-29 11:11:54 +02:00
Joakim Erdfelt 26b4a1143e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-28 05:50:15 -05:00
Joakim Erdfelt fdc210f382
Remove unused imports 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-07-27 08:03:00 -05:00
Ludovic Orban 9288e89684 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-07-08 15:54:20 +02:00
Joakim Erdfelt 9306829a09
Merge pull request #6504 from eclipse/release-11.0.6 
Merge Release 11.0.6
 2021-07-07 08:21:36 -05:00
Joakim Erdfelt 92b6f336b6
Merge pull request #6503 from eclipse/release-10.0.6 
Merge Release 10.0.6
 2021-07-07 08:21:20 -05:00
Greg Wilkins 8945a58ffc
Reduce header cache memory usage on non persistent requests (#6494) 
Delay creating a header cache until a second request on a parser.
Refactored cache code into subclass

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-07-07 12:51:06 +10:00
Lachlan Roberts 273144526e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-07-06 16:08:53 +10:00
Joakim Erdfelt 102caac3fe Updating to version 11.0.7-SNAPSHOT 2021-06-29 11:40:18 -05:00
Joakim Erdfelt 6946943289 Updating to version 11.0.6 2021-06-29 11:15:33 -05:00
Joakim Erdfelt c245a70893 Updating to version 10.0.7-SNAPSHOT 2021-06-29 10:51:22 -05:00
Joakim Erdfelt 37e7731b4b Updating to version 10.0.6 2021-06-29 10:27:56 -05:00
Lachlan 3c32afa05c
Issue #6473 - canonicalPath refactor & fix alias check in PathResource (Jetty-10) (#6478) 
Issue #6473 - canonicalPath refactor & fix alias check in PathResource

* Reverted %-escape handling for URI query parts.
* Performing canonicalization in ServletContext.getResource(),
  and improving alias checking in ContextHandler.getResource().
* Performing canonicalization checks in Resource.addPath() to avoid
  navigation above of the root.
* Test added and fixed.
* Various cleanups.
* Improved javadoc and comments
* Compliance mode HttpURI uses UriCompliance.Violation

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
 2021-06-29 15:42:39 +02:00
Joakim Erdfelt c1b6e30471
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-23 18:14:25 -05:00
Lachlan d233f3be02
Issue #6447 - Deprecate support for UTF16 encoding in URIs (#6457) 
Deprecate support for UTF16 encoding in URIs.
Add compliance mode to allow UTF16 encodings.
Improve testing.
 2021-06-23 22:58:49 +10:00
Simone Bordet 85f61773c3 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-17 10:20:12 +02:00
Simone Bordet b8d6e3f010
Fixes #6410 - Use SocketAddress instead of InetSocketAddress. (#6414) 
* Fixes #6410 - Use SocketAddress instead of InetSocketAddress.

Removed usages of InetSocketAddress in method signatures where possible.
Deprecated old methods, and added new methods with SocketAddress.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-17 10:18:08 +02:00
Greg Wilkins ece8feb4a0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-06-17 08:54:35 +10:00
Greg Wilkins a415606e01
Rename EWYK The AdaptiveExecutionStrategy (#6353) 
Rename EWYK to AdaptiveExecutionStrategy, which better represents the nature of the strategy.

Updated the documentation 
Refactored substrategy selection for code clarity.
Added notes about chaining strategies and thread starvation

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-16 17:22:08 +10:00
Joakim Erdfelt 89d2ea0192 Updating to version 11.0.6-SNAPSHOT 2021-06-11 10:12:15 -05:00
Joakim Erdfelt 50df216262 Updating to version 11.0.5 2021-06-11 09:52:40 -05:00
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Jan Bartel 3648b3916c Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-10 21:27:05 +10:00
Jan Bartel 900c71902c
Issue #6327 Remove DisabledOnJre or test where appropriate (#6386) 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-06-10 21:26:16 +10:00
Joakim Erdfelt 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet c11c8bbd5c Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-06-04 15:27:21 +02:00
Greg Wilkins e3faf81860
Fix #6114 Deploy symlink webapps (#6317) 
* Fix #6114 Deploy symlink webapps

Use Path.toRealPath rather than getCanonicalPath in the Scanner
Make following symlinks configurable

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-06-04 15:10:54 +02:00
Jan Bartel dabb0a0624 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-06-01 10:22:19 +10:00
Greg Wilkins 0d71185e10
Fix #6305 Optimise isProtectedTarget (#6306) 
* Fix #6305 Optimise isProtectedTarget

Fix #6305 Optimise isProtectedTarget by using case insensitive Index.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fix #6305 Optimise isProtectedTarget

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fix #6305 Optimise isProtectedTarget

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-05-28 18:01:25 +10:00
Simone Bordet ddba4aba17 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-24 17:00:38 +02:00
Simone Bordet cfcb2efa80
Fixes #6276 - Support non-standard domains in SNI and X509. (#6296) (#6311) 
* Fixes #6276 - Support non-standard domains in SNI and X509. (#6296)

Improved support for IP addresses in X509 (after #5379).
Introduced SslContextFactory.Client.SniProvider to allow applications to specify the SNI names to send to the server.
Improved logging of SNI processing.
Skip X509 matching over IP addresses when the host does
not look like an IP address, to avoid reverse DNS lookup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 04df6d4ec2)
 2021-05-24 16:57:57 +02:00
Simone Bordet a83bff553c Updated POM versions to 11.0.4-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-21 17:16:21 +02:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-21 17:07:46 +02:00
Ludovic Orban e60f142127 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-05-19 09:43:35 +02:00
Ludovic Orban 61f4dbecdc review comment: improve readability 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-05-19 09:38:28 +02:00
Ludovic Orban 0b97b8415b only release connection when channel got released to avoid double connection release race condition 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-05-19 09:38:28 +02:00
Simone Bordet 2433388e2e Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-10 12:48:32 +02:00
Simone Bordet b5b3874275 Fixes #6099 - Cipher preference may break SNI if certificates have different key types. 
Updated the logic in SslContextFactory.Server.sniSelect(...) to check if there is
any certificate that matches, and if so return a null alias in the hope to be called
again and pick the right alias for the SNI.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 68296911b7)
 2021-05-10 12:25:56 +02:00
Simone Bordet 1aafbc2cd9 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-07 15:53:07 +02:00
Simone Bordet 1c34222415 Fixes #6159 - Jetty with Conscrypt unable to handle any HTTPS requests when connected by IP rather than hostname. 
Added null guard for `ExtendedSSLSession.getRequestedServerNames()`
which should never return null, but it does when using Conscrypt.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-05-07 15:52:24 +02:00
Lachlan Roberts 1d953e72ba Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-19 11:14:19 +10:00
Lachlan 4c98990cd9
Create FileBufferedResponseHandler to buffer responses into a file. (#6010) 
FileBufferedResponseHandler adds an HttpOutput.Interceptor to buffer all responses into a file until the output is closed. This allows the commit to be delayed until the response is complete and thus headers and response status can be changed while writing the body.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-19 11:02:44 +10:00
Lachlan Roberts ad97c8d0a0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-31 11:01:42 +11:00
Lachlan 8a10cd1615
Merge pull request #6094 from eclipse/jetty-10.0.x-WebSocketServerComponents 
Do not store WebSocketComponents in Server scope.
 2021-03-31 10:55:36 +11:00
Olivier Lamy 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-03-26 16:15:49 +10:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-03-26 06:10:47 +00:00
Lachlan Roberts 03f6a318c7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-26 16:20:47 +11:00
Lachlan Roberts a86a0c2662 Add static utility methods on container to add and remove beans. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-26 11:11:45 +11:00
Jesse McConnell e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-25 16:02:45 +01:00
Lachlan Roberts b51e40892d Fix lifecycle issues with WebSocketComponents and improve testing. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-26 00:07:57 +11:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Greg Wilkins be9e1d3a57 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-25 07:44:56 +11:00
Greg Wilkins c1ae922ab0
Use Files.isSameFile to check Resource equality (#6093) (#6095) 
Use Files.isSameFile to check Resource equality
Avoid using canonical and instead use Files.isSameFile

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
 2021-03-24 21:44:27 +01:00
Greg Wilkins 916f4614e6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-03-22 21:32:45 +11:00
Greg Wilkins c59de808f1
Fix #5835 Durable filters and servlets (#6027) 
Fix #5835 Durable filters and servlets with a general ServletHandler cleanup
update indexes after updating mapping
update mappings/indexes before destroyed listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>
 2021-03-22 11:28:25 +01:00
Jan Bartel db633450ad Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-10 10:12:10 +01:00
Jan Bartel 56864bd43d
Issue #6020 Fix redeploy error jetty-maven-plugin (#6023) 
* Issue #6020 Fix redeploy error jetty-maven-plugin

Signed-off-by: Jan Bartel <janb@webtide.com>
 2021-03-10 10:11:34 +01:00
Simone Bordet 3e2efd97a4 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-09 19:25:29 +01:00
Simone Bordet c2181ec566 Improvements to the Jetty documentation. 
Added sections on server logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-09 19:19:50 +01:00
Simone Bordet 521510e4d3 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-08 19:47:41 +01:00
Simone Bordet 8de7b83966 Fixes #6034 - SslContextFactory may select a wildcard certificate during SNI selection when a more specific SSL certificate is present. 
Now matching certificates are sorted, non-wildcard first, so that a more specific alias is returned.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-03-08 19:40:24 +01:00
Joakim Erdfelt 47a90beab5
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-03 14:47:48 -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
Simone Bordet d00e2d7b4f Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2021-02-24 09:42:10 +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
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
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 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06: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
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
Ludovic Orban 22be42c436 Merge branch 'jetty-10.0.x' into jetty-11.0.x 
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
 2021-02-17 16:38:06 +01:00
Ludovic Orban 4cfe7b9e3b
Merge pull request #5953 from eclipse/jetty-10.0.x-5605-wakeup-blocked-threads 
Jetty 10.0.x Fix #5605 Unblock non container Threads
 2021-02-17 14:46:56 +01:00
gregw 78ed082d59 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 10:28:06 +01:00