Commit Graph

2608 Commits

Author SHA1 Message Date
gregw 7a7d69a69f Happy no year
Remove modification date from copyright notice and instead just have the
project inception year.

Signed-off-by: gregw <gregw@webtide.com>
2023-02-15 15:22:32 +11:00
Greg Wilkins 5f25f5b389
Fix/jetty 10.0.x/uri host mismatch alt (#9343)
* Introduce HttpCompliance.MISMATCHED_AUTHORITY

* Update HttpCompliance.RFC2616

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

* Update NcsaRequestLogTest.testAbsolute

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

* Use RFC2616 mode in RFC2616 tests

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

* Alternative fix for mismatched host headers

This PR fixes the miss-matched host header issue in the Request.setMetaData method. This requires no change to the HttpParser.
A more comprehensive fix can be considered for jetty-12.

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

* Alternative fix for mismatched host headers

Updates from review

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

---------

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: gregw <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-14 07:43:19 +11:00
Olivier Lamy bd4cf3c835
Jetty 10 Upgrade to Hazelcast 5 and totally disable auto join multicast etc.. (fix build on CI) (#9331)
* upgrade to hazelcast 5.2.1

Signed-off-by: Olivier Lamy <olamy@apache.org
2023-02-09 18:10:22 +10:00
Joakim Erdfelt 46a316d4df
Issue #9309 - Introducing test for requestlog format with spaces
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-03 08:45:35 -06:00
Simone Bordet 1283b85b60
More JPMS tests for JSTL.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-01 22:48:48 +01:00
Olivier Lamy 7c7a7f3c39
re-enable h3 tests (#8773)
* run h3 tests

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-01-12 09:22:10 +08:00
Eddú Meléndez Gonzales d5a3d8e1f4
Improve DatastoreEmulatorContainer usage (#9081)
* Improve DatastoreEmulatorContainer usage

Update to testcontainers 1.17.6 and take advantage of
`DatastoreEmulatorContainer#withFlags()`
2022-12-26 09:27:27 +10:00
Joakim Erdfelt 54c4c03244
Updating to version 10.0.14-SNAPSHOT 2022-12-07 14:33:17 -06:00
Joakim Erdfelt 1c2636ea05
Updating to version 10.0.13 2022-12-07 14:12:50 -06:00
Joakim Erdfelt 7e1de8b1e2
Issue #8973 - Rework KeyStoreScanner handling for symlink related changes (#9014)
* Issue #8973 - Rework KeyStoreScanner handling for symlink related changes

+ Removed changes from #8786 and #8787
+ More test cases
+ revert jetty.sslContext.reload.followLinks boolean
+ Scanner should follow its own linkOptions setting
+ remove bad documentation in module-ssl-reload.adoc

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Lachlan Roberts <lachlan@webtide.com>
2022-12-07 09:24:19 -06:00
Olivier Lamy c1e570d40e
java inject looks to be needed now
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-29 19:03:01 +10:00
Simone Bordet 83154b4ffe
Fixes #8863 - Provide a possibility to name virtual threads (#8903)
* Fixes #8863 - Provide a possibility to name virtual threads

Reworked the VirtualThreads APIs to be based on `Executor` rather than just `boolean`.
Introduced Jetty module `threadpool-virtual-preview`.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-21 15:39:54 +01:00
Joakim Erdfelt ae6ffdc135
Correct osgi bundle-name
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:36:34 -06:00
Joakim Erdfelt 23c989c6ef
Cleanup imports
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:31:02 -06:00
Joakim Erdfelt f9b8d50a2e
Merge remote-tracking branch 'origin/fix/jetty-10-home-with-docs-awaitility' into fix/jetty-10-home-with-docs
# Conflicts:
#	tests/jetty-home-tester/src/main/java/org/eclipse/jetty/tests/hometester/JettyHomeTester.java
2022-11-16 08:30:16 -06:00
Joakim Erdfelt 6b96b0d5e6
Issue #8895 - More reliable JettyHomeTester.unzip
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-16 08:23:18 -06:00
Olivier Lamy 62746d9d44
review comments 2022-11-16 20:57:07 +10:00
Olivier Lamy 1eb3cd91ab
use Awaitility
Signed-off-by: Olivier Lamy <olamy@apache.org>
2022-11-16 12:55:34 +10:00
Joakim Erdfelt fd558f2eaa
Issue #8895 - fixing JettyHomeTester.await logs timeout
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-15 18:51:10 -06:00
Joakim Erdfelt af227778bb
Issue #8895 - Move JettyHomeTester to own module
+ Fix for circular dependency loop
    test-distribution ->
    jetty-home ->
    jetty-documentation ->
    jetty-asciidoctor-extensions ->
    test-distribution
+ Remove any deps on anything in org.eclipse.jetty from new module

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-15 15:06:59 -06:00
Lachlan 690220fc40
Merge pull request #8787 from eclipse/jetty-10.0.x-8786-KeyStoreScanner-Symlink
Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases
2022-11-10 17:17:59 +11:00
Joakim Erdfelt f99da578af
More reliable `AllowedResourceAliasCheckerTest` (#8872)
* More reliable AllowedResourceAliasCheckerTest

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-08 16:16:37 -06:00
Simone Bordet 1a1b9cfe4c
Fixes #8770 - Review whether to send request body in redirects. (#8775)
* Fixes #8770 - Review whether to send request body in redirects.

Now the original request body is re-sent only if the redirect status code is 307 or 308.
In the other cases, it is a redirect to a GET method, so the Location is followed without resending the body, and the content headers are removed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-08 21:54:20 +01:00
Joakim Erdfelt cf7353f274
Jetty 10 - Improve test reliability (#8868)
* Don't care about stop failures in this test
* More consistent ConnectTimeoutTest
 + using IANA example.com (as it will route to a
   real machine, and will never have this
   specific port open)

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-11-07 16:16:25 -06:00
Joakim Erdfelt 2243ee5f3b
Jetty 10 - Flag flaky tests to be skipped on CI (#8865)
* @Tag("flaky") use instead of @Disabled
* Tweaking timeouts on some tests
* Tweaking timeouts on some tests

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-11-04 14:06:12 -05:00
Lachlan Roberts 0a14cca307 changes from review - rename resolveAlias to followLinks
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 20:37:55 +11:00
Lachlan Roberts 8607e3ef15 changes to ssl-reload module & documentation from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-11-03 18:54:53 +11:00
Lachlan Roberts 4d15593d63 Issue #8786 - add configuration for KeyStoreScanner to not resolve aliases
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-31 14:39:32 +11:00
Gili Tzabari e2e59478ce Update in response to PR comments. 2022-10-24 13:17:25 -04:00
Lachlan Roberts 7e85c2a54c add distribution test to reproduce issue with dry-run
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-10-04 17:43:02 +11:00
Joakim Erdfelt ebfb7c63bb
Bump log4j2 to 2.19.0 (#8605)
* Bump log4j2 to 2.19.0
+ Remove old exclusions to log4j in infinispan
  (no longer relevant)
* fix usage of log4j-slf4j2-impl

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-09-22 17:38:48 +10:00
Olivier Lamy dbd07146ec
merge back release branch to bump version to 10.0.13-SNAPSHOT (#8593)
* Updating to version 10.0.12

* Updating to version 10.0.13-SNAPSHOT

* VERSION.TXT =+ content of jetty-9.4.49.v20220914 release

* remove strange line and reorder
2022-09-16 19:50:12 +10:00
Simone Bordet 77ad0189ba
Fixes #8532 - Review System.nanoTime() usages. (#8535)
* Fixes #8532 - Review System.nanoTime() usages.

Introduced o.e.j.util.NanoTime class to deal with nanoTimes.

Now NanoTime.now() should be used instead of System.nanoTime(),
and various <unit>[elapsed|since|until]() methods to calculate nanoTimes.

Furthermore, comparing 2 nanoTimes should be done via isBefore(),
rather than using the < operator, which is wrong as specified in
the System.nanoTime() javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-09-06 09:30:02 +02:00
Olivier Lamy 6b1eb1486b
remove some unused plugins from poms (#8534)
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-09-02 14:25:46 +10:00
Joakim Erdfelt 3157256ff9
Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0 (#8467)
* Bump slf4j to 2.0.0-beta1 and logback to 1.3.0-beta0
* use new artifactId slf4j-reload4j

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-16 06:58:48 -05:00
Simone Bordet be3d16bdbb
Fixes #8007 - Support Loom. (#8360)
Implemented support for virtual threads for HTTP/1.1, HTTP/2 and HTTP/3.

The virtual thread support is in AdaptiveExecutionStrategy.
When virtual threads are supported and enabled, reserved threads are disabled and
blocking tasks are run in a virtual thread instead that being executed by the Executor.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-10 14:31:04 +02:00
Lachlan 998bc8c7e8
Merge pull request #8315 from eclipse/jetty-10.0.x-8296-AliasChecking
Issue #8296 and #8259 -  AllowedResourceAliasChecker improvements
2022-08-08 13:23:02 +10:00
Lachlan Roberts 99cb930d78 changes from review PR #8315
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-27 10:21:35 +10:00
Lachlan Roberts cff4ff6c98 Issue #8296 - attempt to resolve symlinks for baseResource in ContextHandler.doStart()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-21 18:59:51 +10:00
Joakim Erdfelt cbed42491a
Excluding Stress/Slow tests from normal CI builds. (#8314)
Nightly CI builds still run them.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2022-07-21 02:40:26 -05:00
Lachlan Roberts 6c35fc6f65 Issue #8259 - AliasCheckers for different resource bases on same Context
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-18 17:22:38 +10:00
Lachlan Roberts 5f246ae5d7 Issue #8296 - add test for issue 8296
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2022-07-18 15:20:44 +10:00
Olivier Lamy 9149945945
simplify pom by using simple property rather than xml fragment (#7580)
* simplify pom by using simple property rather than xml fragment

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-07-14 09:42:28 +10:00
Joakim Erdfelt 64d12e2a5a
Merge Release 10.0.11 back into `jetty-10.0.x` branch (#8194)
* Updating to version 10.0.11

* Updating to version 10.0.12-SNAPSHOT
2022-06-22 16:24:48 -05:00
Tamas Cservenak 3fabe540a5
Fix test-distribution classpath re resolver (#8187)
* Fix test-distribution classpath re resolver

As currently it seems mixed versions of resolver artifacts are
present on classpath. Resolver 1.8.0 introduces a binary
breakage.

Anyway, this fixes the thing, as impl was actually coming in
as transitive dep of maven-resolver-provider, that is NOT
the same version as the rest of resolver dependencies.

Relying on transitive while fixing other versions is wrong.

* Update to resolver 1.8.1

And add exclusion to banned dependency, that is used when
running in SISU container.
2022-06-21 15:27:06 -05:00
Joakim Erdfelt c2bc103cb9
Merge Release 10.0.10 back into `jetty-10.0.x` (#8180)
* Updating to version 10.0.11-SNAPSHOT
2022-06-21 14:41:41 +02:00
Ludovic Orban 1f902f6371
Disable H3 tests by default with a system property to explicitly enable them (#8150)
Fixes #8149 disable H3 tests by default with a system property to explicitly enable them

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-06-16 15:59:58 +02:00
Jan Bartel 3caee26742
Jetty 10.0.x 7801 duplicate set session cookie (#7808)
* Issue #7801 Duplicate set session cookie after id change.

Signed-off-by: Jan Bartel <janb@webtide.com>
2022-06-08 10:15:24 +10:00
dependabot[bot] e675db42ca
Bump openwebbeans.version from 2.0.26 to 2.0.27
Bumps `openwebbeans.version` from 2.0.26 to 2.0.27.

Updates `openwebbeans-web` from 2.0.26 to 2.0.27
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.26...openwebbeans-2.0.27)

Updates `openwebbeans-jetty9` from 2.0.26 to 2.0.27
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/compare/openwebbeans-2.0.26...openwebbeans-2.0.27)

---
updated-dependencies:
- dependency-name: org.apache.openwebbeans:openwebbeans-web
  dependency-type: direct:production
  update-type: version-update:semver-patch
- dependency-name: org.apache.openwebbeans:openwebbeans-jetty9
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-03 10:05:53 +00:00
Olivier Lamy d12ee70b5a
exclude log4j-core to avoid problem with m-enforcer-p see https://issues.apache.org/jira/browse/LOG4J2-3241 (#8094)
* exclude log4j-core to avoid problem with m-enforcer-p see https://issues.apache.org/jira/browse/LOG4J2-3241

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-06-02 18:24:28 +10:00