Commit Graph

26099 Commits

Author SHA1 Message Date
Joakim Erdfelt f92c992178
Allow DefaultServlet to resolve static resources 2022-08-04 13:10:19 -05:00
Joakim Erdfelt 6f6c327d8e
Improve reliability of TempDirTest 2022-08-04 12:38:23 -05:00
Joakim Erdfelt 19039f4df8
Remove maxBuffer from ContentFactory.getContent(String) (#8403) 2022-08-04 17:32:50 +02:00
Simone Bordet 90fc840f43
Jetty 12 : Renamed FutureFormFields to just FormFields, as it is mostly used (#8411)
Renamed FutureFormFields to just FormFields, as it is mostly used
as a CompletableFuture, and the "Future" prefix is soo Java 5 :)

Improved releasing of chunks in FormFields implementation.

Improved configuration of FormFields for max number of fields and max form content length.

Fixed Field.toString().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-04 17:18:13 +02:00
Lachlan e086cab807
Fixes #8211 - fix ISE from HttpChannelState if failure during process (#8215)
Now all the logic for completion is in lockedOnComplete().

Avoid throwing in ChannelCallback.succeeded() if HttpChannelState._error != null.
This is necessary because HttpChannelState._error may be set asynchronously by
some event such as HTTP/2 reset streams or idle timeouts, but if there is a
thread dispatched to the application the asynchronous event will not fail the
callback, as the failure may be noticed by the application (e.g. via a read() call).

Fixed TrailersTest.testHandlerRequestTrailers() by avoid reading again after
having read the trailers.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2022-08-04 17:06:32 +02:00
Simone Bordet c077bbecaa
Jetty 12.0.x MultiPart (#8201)
Moved multipart test files to jetty-http.

Introduced jetty-http `MultiPart` class and made `MultiPart.Parser` non-blocking and lenient on newlines.
Made `MultiPartCaptureTest` to pass.

Moved o.e.j.server.MultiPartParserTest tests to o.e.j.http.MultiPartTest.

Renamed MultiPartFormInputStreamTest to MultiPartsTest.

Introduced class o.e.j.server.MultiParts, a CompletableFuture of Parts
that can be used asynchronously in Handlers and in general in core Jetty.

Implemented multi-part handling in ee10.

Implemented DelayedHandler.UntilMultiPart.

Introduced MultiPart.ContentSource as the multipart "generator".

Replaced ByteBuffer/boolean pair with Chunk and implement Chunk slicing & improve retainability for MultiPart parser.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2022-08-04 17:03:40 +02:00
Joakim Erdfelt d97ab506f7
Improved version based on review 2022-08-04 09:15:13 -05:00
Joakim Erdfelt 1f1b9dc2dc
Better handling of jetty-dir.css and favicon.ico 2022-08-04 08:37:56 -05:00
Joakim Erdfelt 74f54da67e
Adding FileSystemPool.Listener support 2022-08-04 07:38:29 -05:00
Ludovic Orban ecd2cabfa2 fix test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-04 12:56:27 +02:00
Ludovic Orban 4b3a329cb2 properly initialize static resource factory
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-04 11:00:19 +02:00
Ludovic Orban 94a60dd862 fix NPE's
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-04 10:55:52 +02:00
Ludovic Orban 341adb4b62 tentatively fixing mount leaks
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 20:45:47 +02:00
Ludovic Orban d50aa39549 fix mount leaks
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 20:44:17 +02:00
Ludovic Orban ae56240423 restore getAlias
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 18:37:19 +02:00
Ludovic Orban a1e08ec56e improve javadoc
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 18:10:22 +02:00
Ludovic Orban dd72e844a3 fix tests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 18:04:01 +02:00
Ludovic Orban 7a28563bcc move toURI to URIUtil
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 17:04:22 +02:00
Ludovic Orban 50c19d317b Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-rework-resource-factory 2022-08-03 17:00:24 +02:00
Ludovic Orban 5ca51c97ad hide ResourceFactory internals and cleanup Mount leftovers
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 16:59:02 +02:00
Ludovic Orban 7df3da2af8 handle review comments
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 16:30:02 +02:00
Ludovic Orban cbff6840d6 fix tests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 16:09:21 +02:00
Joakim Erdfelt bb9b7c7c93
Merge pull request #8410 from eclipse/fix/jetty-12-remove-resource-iscontainedIn-static
Jetty 12 : Remove static Resource.isContainedIn API
2022-08-03 08:53:46 -05:00
Ludovic Orban 2459e7a2cc fix compilation errors
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 14:12:23 +02:00
Joakim Erdfelt 6ce295ce7a
Remove static Resources.isContainedIn API 2022-08-03 06:59:17 -05:00
Ludovic Orban 96eba300ca fix test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 13:41:44 +02:00
Ludovic Orban da3fef6d58 make of(Container container) remove the bean when the container is stopped
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 13:36:00 +02:00
Joakim Erdfelt b4d526796e
Merge pull request #8407 from eclipse/fix/jetty-12-remove-unused-resource-apis
Jetty 12 : Remove unused Resource APIs
2022-08-03 06:15:08 -05:00
Ludovic Orban cb348c8d15 rename of() -> combine()
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 13:06:32 +02:00
Ludovic Orban f2a20436d4 review of mountIfNeeded contract
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 13:03:18 +02:00
Ludovic Orban e0c9943f4d rename createResource -> create
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 13:01:35 +02:00
Ludovic Orban fbfed70fe1 restore ResourceFactory use
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 12:58:51 +02:00
Ludovic Orban dc3e7ca51e fix test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 12:53:58 +02:00
Ludovic Orban 129be15f50 remove obsolete test
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 12:53:50 +02:00
Ludovic Orban fb0290c88a replace ROOT references with root()
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 12:51:57 +02:00
Ludovic Orban b3dbfad97d move newSystemResource to ResourceFactory
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 12:43:08 +02:00
Ludovic Orban abe2f3264a move newClassPathResource to ResourceFactory
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 12:23:49 +02:00
Ludovic Orban faae5898ea fix missed tests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 12:14:59 +02:00
Ludovic Orban 44325b28d6 fix filesystem leaks
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 11:51:29 +02:00
Ludovic Orban f943d095f4 rework ResourceFactory and Resource according to redux3 prototype
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2022-08-03 11:32:21 +02:00
Jan Bartel d99731219b Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-rm-deprecated-initializer 2022-08-03 14:22:26 +10:00
Jan Bartel ffe99495ea Fix for changes to Resource. 2022-08-03 11:41:49 +10:00
Joakim Erdfelt 4e4d516952
Fixing compilation 2022-08-02 16:07:39 -05:00
Joakim Erdfelt 84e154f1e6
Remove unused Resource APIs
+ If no src/main/java code used the API
  then it's removed.
+ APIs created just for test cases
  are also removed, and a similar
  technique is used in the test case.
2022-08-02 15:34:46 -05:00
Joakim Erdfelt 74a11a153f
Merge pull request #8402 from eclipse/fix/jetty-12-resource-html-move-to-resourceservice
Jetty 12 : Refactor our `Resource.getListHTML` to utility class
2022-08-02 11:46:37 -05:00
Joakim Erdfelt a45dc385c8
Refactor our Resource.getListHTML to utility class 2022-08-02 10:06:11 -05:00
dependabot[bot] b7d8635763
Bump wildfly-elytron from 1.19.0.Final to 1.20.0.Final (#8385)
* Bump wildfly-elytron from 1.19.0.Final to 1.20.0.Final

Bumps [wildfly-elytron](https://github.com/wildfly-security/wildfly-elytron) from 1.19.0.Final to 1.20.0.Final.
- [Release notes](https://github.com/wildfly-security/wildfly-elytron/releases)
- [Commits](https://github.com/wildfly-security/wildfly-elytron/compare/1.19.0.Final...1.20.0.Final)

---
updated-dependencies:
- dependency-name: org.wildfly.security:wildfly-elytron
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

* fix upperbound

Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2022-08-02 18:57:35 +10:00
Jan Bartel dad19533b8 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-rm-deprecated-initializer 2022-08-02 16:55:24 +10:00
Olivier Lamy 6c319f339b Merge branch 'jetty-11.0.x' into jetty-12.0.x 2022-08-02 15:52:12 +10:00
Olivier Lamy 5e10334cbb Merge branch 'jetty-10.0.x' into jetty-11.0.x 2022-08-02 15:50:24 +10:00