Commit Graph

18731 Commits

Author SHA1 Message Date
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
Greg Wilkins 324ab668de
More optional etag gzip fixes for #5979 (#5986)
* More optional etag gzip fixes for #5979

IF no separator defined, do not add a suffix to an etag.
Some cleanup of the implementation.

* More optional etag gzip fixes for #5979

updates from review
2021-02-18 17:24:16 +01:00
Joakim Erdfelt a5c8fee872
Merge pull request #5976 from eclipse/jetty-9.4.x-new-header-rules
Adding requested Rewrite Rule to force request header values
2021-02-18 07:27:59 -06:00
Joakim Erdfelt 10e531756b
Merge pull request from GHSA-m394-8rww-3jr7
Use comparator based sort
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: gregw <gregw@webtide.com>

Co-authored-by: gregw <gregw@webtide.com>
2021-02-18 14:14:38 +01:00
Olivier Lamy addfbe81c1
Issue #5977 do not force Cache-Control header if already set (#5978)
* Issue #5977 do not force Cache-Control header if already set

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-02-18 07:29:24 +10:00
Greg Wilkins a8b4927427
Fix #5979 by allowing a configurable etag separator. (#5980)
* Fix #5979 by allowing a configurable etag separator.

Fix #5979 by allowing a configurable etag separator

* updates from review

* Updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-02-17 22:19:23 +01:00
Simone Bordet 70d6724d93
Merge pull request #5974 from eclipse/jetty-9.4.x-5973-proxy_client_tls_auth_example
Fixes #5973 - Proxy client TLS authentication example.
2021-02-17 18:32:35 +01:00
gregw ea3f3a5b93 Update merge to 10 comment 2021-02-17 18:09:37 +01:00
Simone Bordet 25d90380c7 Fixes #5973 - Proxy client TLS authentication example.
Examples, in form of test cases for a proxy that uses TLS client authentication
both towards the remote client and towards the server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-17 14:48:47 +01:00
Ludovic Orban b3bebca034
Merge pull request #5936 from eclipse/jetty-9.4.x-5605-wakeup-blocked-threads
Fix #5605 Unblock non container Threads
2021-02-17 14:46:32 +01:00
Joakim Erdfelt 30c1b467c8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-new-header-rules 2021-02-17 06:40:03 -06:00
gregw 379d06901f Merge branch 'jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 12:42:18 +01:00
gregw 1e364eccf8 Re re Fix rewrite tests for #5954
Re re Fix rewrite tests for #5954. Restore setPathQuery behaviour to preserve queries if none are set.
2021-02-17 12:41:55 +01:00
gregw bbf26a30fb Merge branch 'jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 12:14:08 +01:00
gregw dd5a565c08 Re re Fix rewrite tests for #5954
Re re Fix rewrite tests for #5954. Restore setPathQuery behaviour to preserve queries if none are set.
2021-02-17 12:12:56 +01:00
gregw 83496141a6 Merge branch 'jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-17 10:52:24 +01:00
gregw 3d19679d10 Fix setQueryString issue from #5954
Rewrite rule depending on probably bug that setURIPathQuery did not actually set query if none was passed.
This is a bit of a work around, but further review is needed to see if anything else relied on that behaviour.
2021-02-17 10:51:55 +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
Joakim Erdfelt 7e1de5e9fa
Adding requested rewrite rule to force request header value
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-16 13:58:42 -06:00
gregw 071584668c updates from review 2021-02-16 18:42:28 +01:00
gregw 6b1a8c376f updates from review 2021-02-16 17:48:49 +01:00
gregw 7769f61242 Fixed checkstyle 2021-02-16 16:55:14 +01:00
Greg Wilkins 20ef71fe5d
Fix #4275 fail URIs with ambiguous segments (#5954)
Handle URIs by first resolving relative paths and then decoding.
Added compliance mode to return 400 if there are ambiguous path segments.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-02-16 14:47:41 +01:00
Joakim Erdfelt 7ed68d0681
Issue #5492 - Updating jetty-start property test expectations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 14:25:09 -06:00
Joakim Erdfelt 1b15c1e4a3
Issue #5492 - Changing from "java.feature.*" to "runtime.feature.*"
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 13:09:24 -06:00
Joakim Erdfelt de5b8bc84a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5492-java-features-start-properties 2021-02-15 12:59:48 -06:00
Joakim Erdfelt 5dd987779c
Adding `WhitespaceAfter` checkstyle rule.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-15 12:48:24 -06:00
Joakim Erdfelt 64c7fe076a
Merge pull request #5957 from eclipse/jetty-9.4.x-5950-remove-logging-during-classloading
Issue #5950 - remove WebAppClassLoader logging during loadClass
2021-02-15 12:22:11 -06:00
gregw e2c710e086 updates from review 2021-02-11 15:01:00 +01:00
gregw 769687f773 update from the feedback on the feedback of the feedback from the review.
fix javadoc
2021-02-10 16:38:12 +01:00
gregw 9f2a4f5ad5 Fix #5605 write side
refactored the complete method to consider unrecoverable API states no matter what the httpout state
actually is.  This avoid duplication of OPEN, CLOSING, CLOSED etc. handling.
2021-02-10 15:35:48 +01:00
Jan Bartel 75183e8413
Issue #5909 - Better handling of merged RoleInfo during omitted method constraints (#5917)
* Fix #5909 Better handle merged RoleInfo

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

Co-authored-by: gregw <gregw@webtide.com>
2021-02-09 09:44:53 +01:00
Joakim Erdfelt 165aa1a60a
Issue #5950 - remove WebAppClassLoader logging during loadClass
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-08 13:02:48 -06:00
gregw ed534b84ef Fix #5937
updates from review.
2021-02-05 15:36:34 +01:00
Greg Wilkins f768e2ed68
Fix #5937 (#5949)
Remove size limit on async static content.
2021-02-05 14:50:14 +01:00
gregw 39f6f87ca7 Fix #5605 Unblock non container Threads
Simplification. Always abort on any pending read or write in completion.
2021-02-04 10:26:11 +01:00
gregw 096e8b83e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5605-wakeup-blocked-threads 2021-02-04 09:58:39 +01:00
gregw 7235e492c8 Fix #5605 Unblock non container Threads
Simplification. Always abort on any pending read or write in completion.
2021-02-04 09:58:24 +01:00
gregw e9315fe51f Fix #5605 Unblock non container Threads
revert fillInterest cancellation and just abort connection instead.
tested for all transports
2021-02-03 17:27:25 +01:00
Simone Bordet a26ad6d7ea
Merge pull request #5910 from eclipse/jetty-9.4.x-5787-managedselector_jmx
Fixes #5787 - Make ManagedSelector report better JMX data.
2021-02-03 15:22:58 +01:00
Simone Bordet 0bbc9429a1 Fixed javadoc error.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 15:21:44 +01:00
gregw 5f4919c45a Fix #5605 Unblock non container Threads
cleanup debug
2021-02-03 14:04:29 +01:00
gregw 70056e2c69 Fix #5605 Unblock non container Threads
fix test
2021-02-03 13:40:06 +01:00
gregw 25cbe652a0 Fix #5605 Unblock non container Threads
reorder
2021-02-03 11:27:25 +01:00
gregw a100d80d26 Fix #5605 Unblock non container Threads
Don't consumeAll before upgrade
2021-02-03 11:03:02 +01:00
Joakim Erdfelt 5ad9bc9b3d
Merge pull request #5669 from eclipse/dependabot/maven/jetty-9.4.x/org.eclipse.jetty.toolchain-jetty-version-maven-plugin-2.7
Bump jetty-version-maven-plugin from 2.6 to 2.7
2021-02-02 12:15:53 -06:00
gregw a110fc3468 Fix #5605 Unblock non container Threads
test and fixes for the write side.
2021-02-02 17:55:15 +01:00
gregw 0d85c7d220 Fix #5605 Unblock non container Threads
test and fixes for the write side.
2021-02-02 17:49:17 +01:00
gregw b3268eb3b5 Fix #5605 Unblock non container Threads
Ensure that HttpInput is always closed to EOF, EarlyEOF or Error, so that non container threads doing blocking reads
will not block forever, even if late.   Delay recycling of HttpInput until next request is received.
2021-02-02 16:33:32 +01:00
gregw 9cc7be4842 Fix #5605 Unblock non container Threads
Ensure that HttpInput is always closed to EOF, EarlyEOF or Error, so that non container threads doing blocking reads
will not block forever, even if late.   Delay recycling of HttpInput until next request is received.
2021-02-02 14:03:38 +01:00