Commit Graph

83 Commits

Author SHA1 Message Date
Joakim Erdfelt e05e3323a6
Merge branch 'jetty-12.1.x' of github.com:jetty/jetty.project into jetty-12.1.x 2024-06-19 17:03:15 -05:00
Jan Bartel c5af1aeb3c Fix servlet spec minor version for ee11 2024-06-20 07:52:31 +10:00
Joakim Erdfelt b1c2acfc20
Fix missing notifyRemoteAsyncErrors http config wiring
(#11897)

Fixed missing notifyRemoteAsyncErrors http config wiring and add tests

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2024-06-19 16:49:07 -05:00
Joakim Erdfelt 4a31e66ae7
Fixes #11892 - mtls not working with http/3. (#11900)
The client certificate is now exposed in QuicheConnection, so that it can be returned by QuicStreamEndPoint.getSslSessionData().

Not much else is exposed by Quiche, so not much else that we can provide to applications, for example no TLS session id, no cipher suite, etc.

Fixed --enable-native-access command line option to run tests, as the foreign dependency is in the class-path.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2024-06-19 16:48:51 -05:00
Joakim Erdfelt c88e8a4626
Fix openid.mod files for Jetty 12
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2024-06-19 16:48:31 -05:00
Jan Bartel 5dc9a73970
Jetty 12.1.x move demos (#11836)
* Refactor all ee demos to remove duplicates
2024-05-28 07:59:10 +02:00
Jan Bartel 810eccaeea Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-28 10:23:00 +10:00
Jan Bartel c50d325dfc
Issue #11813 add tests for no-ops on Response after commit. (#11824)
* Issue #11813 add tests for no-ops on Response after commit.

* Change after review
2024-05-28 02:06:12 +02:00
Lachlan f7e502b579
Merge pull request #11828 from jetty/jetty-12.1.x-websocket-HttpSessionTest
add test for HttpSession.Accessor with WebSocket
2024-05-27 11:26:53 +10:00
Greg Wilkins a84f99b1e6
Fix #11815 HttpServletMapping (#11829)
Implemented a test that uses the examples from the javadoc
Fixed the matchValue for PREFIX matches
2024-05-25 10:35:43 +10:00
Greg Wilkins 1e95caa1ef
Implement Servlet 6.1 Error dispatch changes (#11821)
Implement Servlet 6.1 Error dispatch changes

+ Error dispatches are done as GET methods
+ New ERROR_METHOD and ERROR_QUERY_STRING attributes
+ Moved most error attributes to Dispatcher.ErrorRequest
+ removed duplicate attributes

* updates from review

* Update jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ErrorHandler.java

Co-authored-by: Jan Bartel <janb@webtide.com>
2024-05-23 14:49:00 +10:00
gregw c10df2d7ab remove more system/server classes from ee11 2024-05-23 11:51:25 +10:00
gregw 088788e086 remove more system/server classes from ee11 2024-05-23 11:37:05 +10:00
gregw 24335af115 merged ee10 to ee11 2024-05-23 10:56:27 +10:00
gregw 0e5bc9d57d merged ee10 to ee11 2024-05-23 10:27:49 +10:00
Lachlan Roberts 548ed9a08e add test for invaliding the session from WebSocket
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2024-05-22 12:19:16 +10:00
Lachlan Roberts 253eeb92b0 add test for HttpSession.Accessor with WebSocket
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2024-05-22 11:38:13 +10:00
Greg Wilkins 4c1c6a2652
Implemented servlet 6.1 redirect with content (#11743)
* Implemented servlet 6.1 redirect with content

Added option for server to generate a short html redirect body content, as per RFC9110 (default false)
Allowed an aggregated servlet response content to be used if clear is false.

* Redirect is a noop in include

* Fixed init order

This style of extensibility (calling virtuals from constructors) is very fragile.

* Update javadoc from review

Also update EE10 to also noop included response methods

* Update javadoc from review

Also update EE10 to also noop included response methods

* Update javadoc from review

Also update EE10 to also noop included response methods

* Update jetty-ee11/jetty-ee11-servlet/src/main/java/org/eclipse/jetty/ee11/servlet/ServletApiResponse.java

Co-authored-by: Jan Bartel <janb@webtide.com>

* Updating ee11 jsp-impl to 11.0.0-M19

* Updates from review

* updates from review

* Update jetty-core/jetty-server/src/main/java/org/eclipse/jetty/server/Response.java

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>

---------

Co-authored-by: Jan Bartel <janb@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2024-05-20 23:20:24 +10:00
gregw 22ddb6db77 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-16 17:28:29 +10:00
gregw 09f3adc66c Cleanup many warnings from ee10 and ee11 servlet 2024-05-16 17:04:13 +10:00
Jan Bartel 1e0f012f66
Support jetty-eeX-env.xml, as per jetty-eeX-web.xml (#11752)
* Support jetty-eeX-env.xml, as per jetty-eeX-web.xml

---------

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2024-05-10 08:43:48 +02:00
Jan Bartel 0177f0cae3 Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.1.x 2024-05-04 12:58:40 +10:00
Jan Bartel 795b06c049 Fix IJ license header stuffup 2024-05-04 11:08:08 +10:00
Jan Bartel 4bbffa1c15
Jetty 12.1.x jetty ee web xml (#11746)
* Resolve jetty-eeX-web.xml before jetty-web.xml
2024-05-04 02:33:51 +02:00
Olivier Lamy cea1440079
install up to test scope
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-05-03 15:53:52 +10:00
Olivier Lamy 5f1455f5f0
install up to test scope
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-05-03 15:18:47 +10:00
Olivier Lamy 6415fa9277
some debug
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-05-03 14:53:43 +10:00
Olivier Lamy 5f9e46f37d
should fix CI
Signed-off-by: Olivier Lamy <olamy@apache.org>
2024-05-03 11:47:08 +10:00
Jan Bartel 2347c5cce3 OSGi jsp tests don't work because jstl not yet ported to servlet6.1 2024-05-02 16:44:51 +10:00
Jan Bartel c20a723749 See https://github.com/jakartaee/servlet/issues/616 2024-05-01 17:48:30 +10:00
Jan Bartel fa7d8158e0 Add support for HttpSession.Accessor 2024-05-01 15:25:48 +10:00
Jan Bartel da5eee7434 Update all deps to ee11 versions 2024-05-01 11:28:09 +10:00
gregw b11996a3c4 Introduced EE11 and jetty-12.1.x 2024-04-26 22:42:57 +10:00