42d07d664b
Merge pull request #10181 from eclipse/dependabot/maven/jetty-10.0.x/org.asciidoctor-asciidoctorj-diagram-2.2.10
2023-08-01 04:20:35 +00:00
e3bbb0f718
fix websocket demo for ee8 jetty-12
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-08-01 11:48:09 +10:00
a1e88f78a5
fix websocket demo for ee8 jetty-12
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-08-01 11:32:24 +10:00
55e107447b
Merge pull request #10165 from eclipse/jetty-12.0.x-javaxSourceRename
...
rename JAVAX_API to JAKARTA_API in ee9 and ee10 Source
2023-08-01 11:22:44 +10:00
f85bdafba9
Bump net.minidev:json-smart from 2.4.11 to 2.5.0
...
Bumps [net.minidev:json-smart](https://github.com/netplex/json-smart-v2 ) from 2.4.11 to 2.5.0.
- [Release notes](https://github.com/netplex/json-smart-v2/releases )
- [Commits](https://github.com/netplex/json-smart-v2/compare/2.4.11...2.5.0 )
---
updated-dependencies:
- dependency-name: net.minidev:json-smart
dependency-type: direct:development
update-type: version-update:semver-minor
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-08-01 00:28:18 +00:00
eb0295d765
Bump org.asciidoctor:asciidoctorj-diagram from 2.2.9 to 2.2.10
...
Bumps [org.asciidoctor:asciidoctorj-diagram](https://github.com/asciidoctor/asciidoctorj-diagram ) from 2.2.9 to 2.2.10.
- [Release notes](https://github.com/asciidoctor/asciidoctorj-diagram/releases )
- [Commits](https://github.com/asciidoctor/asciidoctorj-diagram/compare/v2.2.9...v2.2.10 )
---
updated-dependencies:
- dependency-name: org.asciidoctor:asciidoctorj-diagram
dependency-type: direct:production
update-type: version-update:semver-patch
...
Signed-off-by: dependabot[bot] <support@github.com>
2023-08-01 00:23:32 +00:00
fc37681cbb
Ensure @BeforeEach and @AfterEach are public methods (not protected)
2023-07-31 16:40:21 -05:00
f15e4a152f
Merge pull request #10179 from eclipse/fix/12.0.x/junit-test-syntax
...
Fix Junit usage issues
2023-07-31 16:33:34 -05:00
4fe2b041c3
Merge pull request #10178 from eclipse/fix/12.0.x/spec-webapp-testing
...
Fix demo-spec webapp failures
2023-07-31 13:03:24 -05:00
8733746c66
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 19:31:57 +02:00
863855bcd5
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 19:27:05 +02:00
56e0069ed3
Fixes #9386 - SSL reports deprecated setting, but ssl.ini still uses it.
...
Removed references to deprecated properties `jetty.sslContext.[key|trust]StoreAbsolutePath`.
Updated documentation to explicitly report that the path can be absolute.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 19:26:20 +02:00
a1d9f589b6
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 19:21:14 +02:00
ad9a9c8b49
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 19:20:41 +02:00
4bfdd51f94
Removed unused code.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 19:20:13 +02:00
5a3549f0d0
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 19:18:19 +02:00
b9c39b1105
Ensure @BeforeEach and @AfterEach are public
2023-07-31 11:53:15 -05:00
ce06628f2e
Ensure WorkDir field is public
2023-07-31 11:44:11 -05:00
b6af685cd0
Ensure @Test methods are public
2023-07-31 11:42:33 -05:00
8e21e6a5d8
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 18:41:35 +02:00
b2477d1c38
Fixes #10160 - Verify PROXY_AUTHENTICATION is sent to forward proxies ( #10162 )
...
Now TunnelRequest.getURI() does not return null, so normalizeRequest() can properly apply the authentication headers.
Moved copy of a request to HttpRequest, so also the sub-type can be copied.
Fixed restore of destination in HttpProxy.HttpProxyClientConnectionFactory.newProxyConnection(): now doing it in the promise rather than in finally block.
Using the proxy destination (not the server's) to send subsequent CONNECT requests in case the first is not replied with 200.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 18:39:13 +02:00
4a2ebe00be
Issue #10164 - test to prove out FSPool mount vs reference count logic ( #10170 )
...
* Issue #10164 - test to prove out FSPool mount vs reference count logic
* Issue #10164 - improve ResourceFactory.LifeCycle.dump behavior
2023-07-31 11:11:34 -05:00
a157cf7cb8
Create IO.copyDir(Path, Path, CopyOptions...) and use it
2023-07-31 11:10:51 -05:00
c445784957
Fix demo-spec webapp failures
2023-07-31 10:59:34 -05:00
c90c42ffc6
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 17:54:50 +02:00
63835462ec
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 17:18:06 +02:00
afef05a413
Fixes #9720 - Http2Session.streamIdleTimeout should permit being disabled
...
Now allowing to specify a negative value for AbstractHTTP2ServerConnectionFactory.streamIdleTimeout, while 0 implies to use the default value (from the EndPoint).
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 17:17:01 +02:00
e030aeefa6
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 17:01:49 +02:00
bd7d504c28
Issue #10135 - fix empty binary frame from websocket flush ( #10175 )
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-07-31 15:21:12 +02:00
730620eec1
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 15:16:30 +02:00
87c24e7258
Fixes #8405 - onAllDataRead() is called twice under h2 if the stream … ( #10174 )
...
* Fixes #8405 - onAllDataRead() is called twice under h2 if the stream times out
Per Servlet semantic, HTTP/2 stream timeout should be ignored.
The code was trying to fail the read via `_contentDemander.onTimeout()`, but
then it was still calling `onContentProducible()`, which was returning `true`
because the state of the read was IDLE (all the request content was read) and
the request was suspended.
Now the code checks if the read was really failed; if it is not, then
`onContentProducible()` is not called and so the idle timeout is ignored.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-31 15:13:50 +02:00
627f9f7321
fix additional javax references from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-07-31 12:15:41 +10:00
12f179646d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2023-07-31 11:47:51 +10:00
e268917fb3
Merge pull request #10136 from eclipse/jetty-10.0.x-10135-websocketFlush
...
Issue #10135 - fix empty binary frame from websocket flush
2023-07-31 11:45:32 +10:00
5332839e12
Fix #10121 some demo files were not filtered correctly to transform jakarta to javax ( #10159 )
...
* Fix #10121 some files were not filtered
Signed-off-by: Olivier Lamy <olamy@apache.org>
---------
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-07-28 07:45:24 +02:00
74d136076a
Merge branch 'jetty-10.0.x' into jetty-10.0.x-10135-websocketFlush
2023-07-28 15:29:16 +10:00
4e9c59cb78
rename JAVAX_API to JAKARTA_API in ee9 and ee10 Source
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-07-28 15:14:05 +10:00
a03c5251df
jdk21 build to replace 19 ( #10161 )
...
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-07-27 23:09:37 +02:00
3d24929287
Fix #10155 include writer outputstream ( #10157 )
...
* Fix #10155 Include mixed writers and input streams
---------
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2023-07-27 18:28:29 +02:00
8149db2286
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-27 00:13:49 +02:00
f415c5ebea
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-27 00:09:10 +02:00
90910fa337
Fix #10143 executable comparator ( #10156 )
...
Fixed the executable comparator to always be transitive.
Signed-off-by: gregw <gregw@webtide.com>
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-07-27 00:03:07 +02:00
dd45793562
Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x
2023-07-27 00:01:18 +02:00
e7ab35e749
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-27 00:00:10 +02:00
4a8b517e58
Add extra DefaultServlet include tests ( #10154 )
...
#10142 Added extra DefaultServlet include tests
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: gregw <gregw@webtide.com>
2023-07-26 23:36:31 +02:00
9093253b4e
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-26 23:02:24 +02:00
a5a0a6c887
Fixes #10145 - WritePendingException over HTTP/2 tunnel ( #10146 )
...
Method HTTP2StreamEndPoint.flush() has a "no pending operation" semantic, but the previous implementation was calling stream.data(), which may become a pending operation if the stream is congested.
Changed the implementation of flush() to return false in the IDLE and PENDING cases.
Now every flush() is converted to a write(), which has the same semantic as stream.data().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-07-26 22:59:24 +02:00
7f8cb33518
Issue #10139 - DefaultServlet not working with named dispatch in Jetty-12 EE10 ( #10140 )
...
* Issue #10139 - check dispatch type and servlet name in DefaultServlet.isDefaultMapping
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
* Issue #10139 - Two new test cases for INCLUDE/FORWARD to "default" named DefaultServlet
---------
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-07-26 15:02:08 +02:00
ad5c2985d5
Issue #10134 - Delay Base Resource validation to `ContextHandler.doStart()` ( #10147 )
...
* Issue #10134 - Delay Base Resource validation to `ContextHandler.doStart`
2023-07-26 06:36:23 -05:00
453526845d
Issue #10141 and #10142 - Reintroduce context init-param `org.eclipse.jetty.servlet.Default.` prefix for ee10 ( #10149 )
...
+ Issue #10141 and #10142 - Reintroduce context init-param `org.eclipse.jetty.servlet.Default.` prefix for ee10
+ Fix named servlet lookup NPE in ee10 ServletHandler.getMappedServlet
+ Adding requested javadoc
2023-07-26 06:35:54 -05:00
dependabot[bot]
Lachlan Roberts
Joakim Erdfelt
Simone Bordet
Olivier Lamy
Greg Wilkins
Ludovic Orban