Commit Graph

27365 Commits

Author SHA1 Message Date
Simone Bordet 4db0c70735 Fixes #9326 - Rename DecryptedEndPoint to SslEndPoint.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-09 22:17:51 +01:00
Lachlan 55357f4b00
Merge pull request #9328 from eclipse/jetty-12.0.x-websocket-autodemanding
Issue #8991 - rename websocket isDemanding() method to isAutoDemanding()
2023-02-09 20:52:39 +11:00
Olivier Lamy 713bc59289
Merge branch 'jetty-11.0.x' into jetty-12.0.x 2023-02-09 18:28:24 +10:00
Olivier Lamy d94a620798
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2023-02-09 18:12:29 +10: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
Lachlan Roberts 2d11517dd6 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-websocket-autodemanding 2023-02-09 18:22:49 +11:00
Lachlan Roberts 5e72c568d0 #9328 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-09 18:20:37 +11:00
Lachlan 3259a55ce3
Merge pull request #9287 from eclipse/jetty-12.0.x-multipartCleanups
Issue #9076 - Cleanups and fixes for multipart in Jetty 12
2023-02-09 18:10:01 +11:00
Lachlan Roberts 820fbb7331 #9287 - catch error in ee9 maxRequestSize MultiPart test
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-09 15:57:50 +11:00
Lachlan 3ed9302c0f
Merge pull request #9235 from eclipse/jetty-12.0.x-9233-core-common-util-cleanup
Issue #9233 - cleanup of websocket-core-common util package
2023-02-09 15:52:21 +11:00
Jan Bartel 342bd40e0b
Jetty 12.0.x 9301 fix ee10 jstl jpms (#9321)
* Issue #9301 Fix dependencies for ee10-glassfish-jstl module

* Fix jstl,el,jsp to work in jpms and osgi.
2023-02-09 09:35:54 +11:00
Jan Bartel 751b0a8046
Issue #9301 Fix dependencies for ee10-glassfish-jstl module (#9303) 2023-02-09 09:35:02 +11:00
Olivier Lamy b070115dc9
Jetty 12 Hazelcast 5.x and disable auto detection/multicast" (#9332)
* Upgrade to hazelcast 5.2.1
* simplify disable autodetection

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-02-09 08:10:33 +10:00
Lachlan Roberts 341ac15061 #9287 - fix further test failures
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-09 08:37:00 +11:00
Simone Bordet 83d6e1756e
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-08 10:37:31 +01:00
Simone Bordet ea3429e1b9
Fixed imports.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-08 10:34:44 +01:00
Simone Bordet a7bd164f8d
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-08 10:29:12 +01:00
Dominik Zöchbauer 40f7fc8510
Issue #7650 - Fix race condition when stopping QueuedThreadPool (#9325)
* Issue #7650 - Fix race condition when stopping QueuedThreadPool

Signed-off-by: Dominik Zöchbauer <dominik@zoechbauer.info>
Co-authored-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-08 10:27:14 +01:00
Lachlan Roberts 1e92759578 #9287 - remove unpaired release of Content.Chunk
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-08 16:51:39 +11:00
Lachlan Roberts d2dcbeba5b Issue #8991 - rename websocket isDemanding() method to isAutoDemanding()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-08 14:18:02 +11:00
Lachlan Roberts cb511bed8a Issue #9287 - fix failing tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-08 13:58:18 +11:00
Lachlan Roberts 6950d73fce Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-multipartCleanups 2023-02-08 11:55:37 +11:00
Ludovic Orban b87f9385c8
Jetty 12: Cleanup `StatisticsHandler` (#9291)
#9145 cleanup statistics

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-02-07 17:43:46 +01:00
Simone Bordet d02932f690
Fixes #9288 - Jetty 12 - Use oej.http.HttpCookie in jetty-client. (#9289)
* Replaced usages of java.net.HttpCookie with oej.http.HttpCookie.
* Moved server-side only methods from HttpCookie to HttpCookieUtils.
* Introduced and implemented oej.http.HttpCookieStore.
* Removed now obsolete oej.util.HttpCookieStore.
* Introduced HttpScheme.isSecure(String), to avoid code duplication.
* Fixed handling of cookie "localhost" domain in HttpClient.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-07 17:28:01 +01:00
Greg Wilkins f565122571
Redo Handler renaming (#9318)
* Redo Handler renaming

Wrapper to Singleton
BaseWrapper to Wrapper

* Updates from review
2023-02-07 16:41:15 +11:00
Lachlan Roberts d005e975b0 changes f rom review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-07 15:47:17 +11:00
Greg Wilkins d901237e07 fixed style
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2023-02-07 08:14:37 +11:00
Greg Wilkins 461c306fcf cleanup TODOs for decoration
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2023-02-07 07:46:03 +11:00
Simone Bordet 5cc07994c0
Issue #9300 - Rename RetainableByteBufferPool to ByteBufferPool
ArrayRetainableByteBufferPool -> ArrayByteBufferPool.
Updated field names.
Updates tests.
Updated *.mod files to not reference RetainableByteBufferPool.
Updated javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-06 10:31:14 +01:00
Simone Bordet 44980ebfc3
Merge branch 'issue/9284' of https://github.com/kohlschuetter/jetty.project into kohlschuetter-issue/9284 2023-02-06 10:16:32 +01:00
Greg Wilkins d5866d3521 Removed TODOs that will not be done. 2023-02-06 17:05:01 +11:00
Joakim Erdfelt 0a4a077819
Merge pull request #9310 from eclipse/fix/jetty-10.0.x/requestlog-format-with-spaces
Issue #9309 - Introducing test for requestlog format with spaces
2023-02-05 20:27:12 -06:00
Lachlan 39c0c09fec
Merge pull request #9193 from eclipse/jetty-12.0.x-9067-DefaultServletInclude
Issue #9067 - Fixes to include dispatch for pathInContext and welcome files.
2023-02-06 12:23:07 +11:00
Greg Wilkins 60a08f5349
Rename Handler Nested & Collection (#9305)
There is now a Handler interface hierarchy:
 + Container is a Handler that has 1 or more contained Handlers.
 + Wrapper is a Container with only 1 handler and a setHandler method.
 + Collection is a Container with n handlers and a addHandler method

class are now:
 + Abstract implements Handler
 + AbstractContainer extends Abstract implements Container
 + BaseWrapper extends AbstractContainer implements Wrapper
 + Sequence extends AbstractContainer implements Collection

 Lots of other associated cleanups
2023-02-06 12:15:35 +11:00
Lachlan Roberts c7e7fd837c Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-multipartCleanups 2023-02-06 11:18:19 +11:00
Lachlan Roberts 1610cd3692 add todo to revert to normal pool after fix for #9311
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-02-06 11:10:21 +11:00
Olivier Lamy 377798ff50
fix surefire jpms configuration
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-02-05 17:10:36 +10:00
Olivier Lamy dedcfe1d22
fix merge
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-02-05 16:48:22 +10:00
Olivier Lamy 4812eb1c89
Merge branch 'jetty-11.0.x' into jetty-12.0.x-merg 2023-02-05 16:34:58 +10:00
Olivier Lamy a600506155
fix merge
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-02-05 16:08:11 +10:00
dependabot[bot] 44cd3ee541
Bump maven.surefire.plugin.version from 3.0.0-M5 to 3.0.0-M8 (#9255) 2023-02-05 15:58:03 +10:00
Christian Kohlschütter b8ab66fd1d Rename RetainableByteBufferPool to ByteBufferPool
With issue #9166, ByteBufferPool was removed and replaced by
RetainableByteBufferPool. Since ByteBufferPool was used by
AbstractConnector, this change broke backwards compatibility with
third-party connectors such as junixsocket-jetty.

Since there's no longer any other ByteBufferPool, rename the
RetainableByteBufferPool interface, and thereby not only reinstate
compatibility with existing third-party libraries but also save a few
keystrokes.

https://github.com/eclipse/jetty.project/issues/9284

Signed-off-by: Christian Kohlschütter <christian@kohlschutter.com>
2023-02-04 23:39:29 +01:00
Greg Wilkins 51ee6332bb Fixed merge 2023-02-05 09:26:08 +11:00
Greg Wilkins 7e35cdbe59 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-02-05 09:25:33 +11:00
Greg Wilkins 8bf7c9cef8
Fix #9285 use possibly wrapper response for redirection (#9286)
Use the servlet response sendRedirect method.
Always close the connection if there is content.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2023-02-05 09:18:24 +11:00
Simone Bordet 9916706b5f
Issue #9293 - Jetty 12 - Relax JPMS dependencies (quic) (#9307)
Relaxed jetty-quic JPMS dependencies.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-04 14:38:33 +01:00
Simone Bordet c18194b20f
Issue #9293 - Jetty 12 - Relax JPMS dependencies (fcgi) (#9306)
Relaxed jetty-fcgi JPMS dependencies.
Packages generator and parser were not internal,
was just matters of exporting them.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-02-04 14:38:08 +01:00
Joakim Erdfelt a13a932335
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-02-03 08:49:57 -06: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
Joakim Erdfelt 016de2faeb
Jetty 10 - Configurable Unsafe Host Header (#9283)
* Adding HttpCompliance.DUPLICATE_HOST_HEADERS
  + Optional compliance that allowance duplicate host headers.
* Adding HttpCompliance.UNSAFE_HOST_HEADER
  + Optional compliance that allows unsafe host headers.
* Adding warning logging for bad Host / authority situations

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-02-03 08:30:07 -06:00