Commit Graph

28161 Commits

Author SHA1 Message Date
Lachlan Roberts c942a918d9 fixes for websocket demand changes
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-28 14:30:17 +10:00
Lachlan Roberts e2ca582e10 fix .mod files and tests for websocket client
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-28 11:12:56 +10:00
Joakim Erdfelt 08d9535d4f
Merge pull request #9978 from eclipse/fix/12.0.x/testcase-zipfs-backslash
Adding test to prove out zipfs bug with backslash character
2023-06-27 07:29:35 -05:00
Joakim Erdfelt 54dbd9515a
Adding test to prove out zipfs bug with backslash character 2023-06-27 07:25:22 -05:00
Olivier Lamy 0c1ea6fe94
Merge branch 'jetty-10.0.x' into jetty-10.0.x-update-plexus-utils-4.0.0 2023-06-27 11:26:01 +02:00
Lachlan Roberts 6ba4670fb9 split a webapp module for jetty-ee9-websocket-jetty-client
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-27 18:07:59 +10:00
Lachlan Roberts a4d5558bd8 split a webapp module for jetty-ee10-websocket-jakarta-client
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-27 17:09:47 +10:00
Lachlan Roberts e2cc47b0f8 split a webapp module for jetty-ee9-websocket-jakarta-client
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-27 16:17:44 +10:00
Lachlan Roberts 0709946675 Issue #9965 - make multiple websocket demand throw ISE
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-27 14:09:41 +10:00
Lachlan Roberts 2b4e8960e6 #9945 - update javadoc to say demand() can throw ReadPendingException
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-27 13:51:22 +10:00
Lachlan Roberts 8b0e28f7b5 update javadoc for nested ContextHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-27 13:07:02 +10:00
Ludovic Orban cbd83c91c2
Fix default servlet character encoding directories (#9970)
#9966 adapt character encoding when including a path that is a directory listing

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-26 22:09:17 +02:00
Steffen Nießing 939689b669
Spotbugs fixes (#9961)
* Add zone id to DateTimeFormatter

Inline the call to withZone(ZoneId) because it returns a new DateTimeFormatter instead of modifying the current one in-place

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Remove redundant null-check

The array already was null-checked, so remove the redundant check

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Cleanup ArrayUtil

ArrayUtil provides static methods only -> Prevent instantiation and remove unused interfaces

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Remove dead assignment

The charset variable isn't accessed after the assignment anymore

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Prevent instantiation

TypeUtil contains static members only and should not be instantiated

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Remove redundant null-check

The loader variable is checked to be non-null before

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Restrict charset to ascii

The JavaDoc describes the byte array to contain ascii characters only

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Prevent instantiation

StringUtil contains static members only

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

* Prevent instantiation

IO contains static members only

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>

---------

Signed-off-by: Steffen Nießing <zuniquex@protonmail.com>
2023-06-26 18:24:13 +02:00
Greg Wilkins 3a5136834f
Deflake ReservedThreadExecutorTest (#9968)
* Deflake ReservedThreadExecutorTest

Use awaitability with longer times to avoid short optimistic waits in tests.

* Deflake ReservedThreadExecutorTest

Use awaitability with longer times to avoid short optimistic waits in tests.
2023-06-26 16:16:35 +02:00
Olivier Lamy f2aee378a3
ensure DemoModulesTest use random port for ssl connector (#9969)
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-06-26 12:47:58 +02:00
Ludovic Orban bf2ef887b8 Specify jetty.ssl.port to the command that actually executes jetty
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-26 11:05:26 +02:00
Lachlan Roberts 6dd5fd7225 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-ContextHandlerClassLoading 2023-06-26 12:38:49 +10:00
Lachlan Roberts 2030afea62 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-WebSocketDemand 2023-06-26 12:12:56 +10:00
Simone Bordet ef1fa40790
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-25 10:39:48 +02:00
Simone Bordet 4413c2b8a0
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-25 10:39:01 +02:00
Almas Abdrazak 283b74a599
Fixes #9947 - check that each selector inside of _selectors isn't null before calculating #totalKeys (#9962)
Check that selector isn't null before calculating totalKeys.
2023-06-25 10:37:34 +02:00
Greg Wilkins dd71db35fd
Fix #9955 zero status (#9956)
Fix #9955 zero status is 200 in servlet API
2023-06-23 17:22:29 +02:00
Greg Wilkins 62e6cf2b76
Fix #9953 handled HEAD (#9957)
* Fix #9953 handled HEAD

Fix #9953 so that if a Handler self handles HEAD by not writing content, then the length checks do not fire if 0 bytes have been written.

* updates from review
2023-06-23 17:21:27 +02:00
Ludovic Orban f6e963c841
Disable parallel execution of module that contains DistributionTests (#9952)
Specify jetty.ssl.port to avoid clashes with parallel tests

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-23 17:04:22 +02:00
Jan Bartel 151d487fb9 Update plexus-utils to 4.0.0 2023-06-23 16:06:58 +02:00
Ludovic Orban 8f4a15c7da
#9946 Stop passing Handler in constructor as a parent (#9948)
#9946 Stop passing Handler in constructor as a parent

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-23 14:44:12 +02:00
gregw 840fd34525 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-06-23 10:11:04 +02:00
gregw 32399b14d2 Fixed bad merge 2023-06-23 10:05:24 +02:00
gregw 875740fde7 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x
# Conflicts:
#	jetty-ee9/jetty-ee9-proxy/src/test/java/org/eclipse/jetty/ee9/proxy/AbstractProxyServletTest.java
2023-06-23 09:24:43 +02:00
gregw ae01e36388 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-06-23 09:18:53 +02:00
Gary Gregory 4e19fac07a
Bulletproof AbstractProxyServlet#destory() to make it easier to write (#9938)
unit tests for custom subclasses of AbstractProxyServlet

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2023-06-23 09:17:58 +02:00
Greg Wilkins a3e82326cf
Experiment/jetty 12 chunk isError and warnings (#9904)
* Remove usage of instanceof Content.Chunk.Error
* Updated AsyncContent to accept a transient failures
* Updated AsyncContent to accept a transient failure with inputstream
2023-06-23 09:17:15 +02:00
Greg Wilkins 9a38e3ba41
Reinstated StopTest (#9950)
Reenbled StopTest for #9949
2023-06-23 07:09:58 +02:00
Greg Wilkins 0b1c28a888
Jetty 12 inserted handler in ee10 servlet context (#9927)
This PR refactors the ee10 handing of servlet API request and response objects:

 + The ServletContextHandler matches the request to a servlet and creates a one time only ServletContextRequest and a ServletContextResponse
 + A reusable ServletChannel object with all the heavy weight HttpInput and HttpOutput object is associated with the ServletContextRequest and ServletContextResponse.
 + Once the handling reaches the ServletHandler, the possibly wrapped request, response and callback are associated with the ServletChannel before handling.
 + Were possible the ServletApiRequest and ServletApiResponse use the possibly wrapped request/response

Added tests to check that GzipHandler can now be nested inside of an EE10 context.

---------

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Signed-off-by: gregw <gregw@webtide.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2023-06-22 17:04:49 +02:00
Lachlan Roberts d5c81f9f93 fix checkstyle error
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-22 21:07:09 +10:00
Lachlan Roberts 0ffeb87817 use fields in nested Request instead of attributes for last context
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-22 20:56:14 +10:00
Jan Bartel 715535ab95 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-06-22 11:50:06 +02:00
Jan Bartel cc7cd7c7aa Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-06-22 11:48:46 +02:00
Basil Crow 73dfac9732
Use non-deprecated WOFF MIME type (#9922)
Signed-off-by: Basil Crow <me@basilcrow.com>
2023-06-22 11:47:53 +02:00
Jan Bartel 3f159fcf32
Issue #9925 Also use current context for alternate getServletContextHandler method (#9941) 2023-06-22 10:25:12 +02:00
Olivier Lamy 2d174730ed
fix surefire configuration
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-06-22 15:34:59 +10:00
Lachlan Roberts 9e99a58ac4 Issue #9944 - remove integer from demand in websocket core
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-22 09:08:29 +10:00
Lachlan Roberts 44de5cd62b fix NPE from Response.checkSameSite()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-22 07:49:24 +10:00
Ludovic Orban b9ca6d2233
Fix ee10 path info only (alternative) (#9934)
Fix ee10 path info only

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Jan Bartel <janb@webtide.com>
2023-06-21 17:50:33 +02:00
gregw 5116039660 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-06-21 11:19:50 +02:00
gregw 8c59afd847 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-06-21 11:19:22 +02:00
Greg Wilkins 9041527f94
Fix #9476 IteratingCallback multiple onCompleteFailure calls (#9940)
Change state to FAILED from PENDING state
2023-06-21 11:18:43 +02:00
Lachlan Roberts 57a863088b save some attributes for request log and error dispatch
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-21 17:06:18 +10:00
Lachlan Roberts 8550493c31 decode Path in content for nested Request
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-21 14:58:09 +10:00
Lachlan b5360f377f
Merge pull request #9923 from eclipse/jetty-12.0.x-9919-ServerByteBufferPool
Issue #9919 - Avoid creating two ByteBufferPools for the server
2023-06-21 11:53:14 +10:00