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

27007 Commits

Author SHA1 Message Date
Lachlan Roberts 126658145c remove setter for HttpContentFactory on ResourceHandler 
revert to using computeIfAbsent on CachingHttpContentFactory
make direct buffers configurable on CachingHttpContentFactory

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-11 00:49:55 +11:00
Lachlan Roberts bff3c83726 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 17:38:46 +11:00
Lachlan Roberts 539777492e Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-10 17:20:21 +11: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
Lachlan Roberts 3c9b912dc6 Issue #8330 - port openid changes to ee10 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-10 17:07:11 +11:00
Lachlan Roberts 7cccd9629f Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-10 17:05:00 +11:00
Lachlan Roberts 27670be944 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-10 16:54:16 +11:00
Lachlan 4f633e945c
Merge pull request #8792 from eclipse/jetty-10.0.x-OpenIdSessionSerialization 
Issue #8330 - fix IllegalStateException from using OpenID with SessionDatastore
 2022-11-10 16:54:03 +11:00
Lachlan Roberts eeb4df9965 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-10 16:20:30 +11:00
Lachlan Roberts 1c6d36e44a changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-10 16:16:51 +11:00
Lachlan Roberts 24ce284e04 add return to BufferUtil.readFrom javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-10 10:43:58 +11:00
Lachlan Roberts 387d380f75 fixes to the CachingHttpContentFactory caching algorithm 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-10 10:42:58 +11:00
Joakim Erdfelt 27abda6299
Issue #8877 - disabling hazelcast testing until k8s issue can be solved (in a branch) 2022-11-09 11:59:16 -06:00
Joakim Erdfelt a34e45a09e
Issue #8877 - disabling hazelcast testing until k8s issue can be solved (in a branch) 2022-11-09 11:58:46 -06:00
Joakim Erdfelt 08c47f5f57
Jetty 12 - use JVM provided null OutputStream (#8789) 
* Remove IO.getNull* methods and use JVM versions

+ This also honors the open/close/error on
  bad use of the streams/writers
 2022-11-09 07:06:43 -06:00
Simone Bordet e2e4d256e7
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:23:27 +01:00
Simone Bordet 40e79c88ab
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:17:44 +01:00
Simone Bordet c280e31b46
Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet. (#8873) 
* Fixes #7117 - Timeout with Expect 100 continue when using ProxyServlet.

Now getReader() tests whether it has to send a 100 continue in case getInputStream() 
is not called because the reader is reused.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:16:42 +01:00
Simone Bordet 0e3f3ac316
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:14:29 +01:00
Simone Bordet 3b65cd32c9
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:13:55 +01:00
Simone Bordet f21fa6e6e9
Fixed flakyness of GracefulShutdownTest by explicitly setting the Connector shutdownIdleTimeout to a large value that does not interfere with the tests. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-09 12:13:27 +01:00
Lachlan Roberts 3d96b4b7d0 fix javadoc 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:52:17 +11:00
Lachlan Roberts 890d02568c use double checked locking for FileMappedHttpContent 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:43:42 +11:00
Lachlan Roberts 5fec1801f5 add getters and setters for HttpContentFactory onto ResourceHandler 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:20:52 +11:00
Lachlan Roberts a4e773a7ab changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-09 14:10:49 +11:00
Joakim Erdfelt aa9df2a402
Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2022-11-08 18:16:45 -06:00
Joakim Erdfelt 3ffc29f669
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-08 18:09:01 -06:00
Joakim Erdfelt 793bee9e14
Issue #8716 - Handle bad host/authority headers better (#8717) 
* Issue #8716 - Handle bad host/authority headers better
* Remove extra `Host` header in testcase that doesn't deal with bad Host headers
* Create URIUtil.isRegName
* Correcting HostPortTest.testValidAuthority
* Correcting RequestTest.testInvalidHostHeader
* Remove clonable, set to final

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2022-11-08 18:08:20 -06: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 bb3355be83
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-08 22:26:39 +01:00
Simone Bordet 8893cc2b94
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-08 21:55:10 +01: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
Lachlan Roberts 75f210d20b Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-HttpContent-Caching-Refactor 2022-11-08 21:22:53 +11:00
Lachlan Roberts 489da47a38 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2022-11-08 18:17:37 +11: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
Simone Bordet 4225544222
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-07 19:34:43 +01:00
Simone Bordet c96b14f25c
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-07 18:45:28 +01:00
Simone Bordet cd737489f9 Fixes #8811 - HTTP/2 session shutdown race may cause Server.stop() to block until stop timeout. 
Now a completed future is returned from shutdown() if the session is already closed.

Moved the notification of the CompletableFuture to terminate(), which is always invoked.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-07 18:43:34 +01:00
Joakim Erdfelt 77ceb4172d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-04 17:34:58 -05:00
Joakim Erdfelt 27f60b35f9
Merge pull request #8796 from eclipse/dependabot/maven/jetty-10.0.x/org.jboss.logmanager-jboss-logmanager-2.1.19.Final 
Bump jboss-logmanager from 2.1.18.Final to 2.1.19.Final
 2022-11-04 17:34:46 -05:00
Joakim Erdfelt fbd4387a3e
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2022-11-04 15:42:41 -05:00
dependabot[bot] 031af1f2ec
Bump jboss-logmanager from 2.1.18.Final to 2.1.19.Final 
Bumps jboss-logmanager from 2.1.18.Final to 2.1.19.Final.

---
updated-dependencies:
- dependency-name: org.jboss.logmanager:jboss-logmanager
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-04 20:42:12 +00:00
Joakim Erdfelt bb5813b5b7
Merge pull request #8797 from eclipse/dependabot/maven/jetty-10.0.x/org.testcontainers-testcontainers-bom-1.17.5 
Bump testcontainers-bom from 1.17.4 to 1.17.5
 2022-11-04 15:41:12 -05:00
dependabot[bot] 07a1d9041c
Bump maven-shade-plugin from 3.4.0 to 3.4.1 (#8795) 
Bumps [maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.4.0 to 3.4.1.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.4.0...maven-shade-plugin-3.4.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2022-11-04 15:39:15 -05:00
Joakim Erdfelt b3505ae687
Jetty 12 - General cleanup of URIUtil (#8861) 
+ Removal of __CHARSET
+ Removal of unused methods
+ Using new switch/case concepts
+ cleanup of URIUtil constants
+ cleanup of URIUtil methods
+ collapse separate methods
+ simplify encodePath()
* Javadoc updates
* equalsIgnoreEncoding cleanup (no longer used by Resource layer)
 2022-11-04 14:28:53 -05:00
dependabot[bot] f83b631763
Bump testcontainers-bom from 1.17.4 to 1.17.5 
Bumps [testcontainers-bom](https://github.com/testcontainers/testcontainers-java) from 1.17.4 to 1.17.5.
- [Release notes](https://github.com/testcontainers/testcontainers-java/releases)
- [Changelog](https://github.com/testcontainers/testcontainers-java/blob/main/CHANGELOG.md)
- [Commits](https://github.com/testcontainers/testcontainers-java/compare/1.17.4...1.17.5)

---
updated-dependencies:
- dependency-name: org.testcontainers:testcontainers-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2022-11-04 19:07:57 +00: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
Simone Bordet bff5b3eb8f
Code cleanup. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-03 21:56:38 +01:00
Simone Bordet 41e9842921
Fixes #8858 - Jetty 12 Review MovedContextHandler. (#8859) 
* Fixes #8858 - Jetty 12 Review MovedContextHandler.

Updated method names to avod references to Servlet concepts.
Added test cases.
Updated XML files.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2022-11-03 16:13:46 +01: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