Commit Graph

28250 Commits

Author SHA1 Message Date
gregw 3104420e6c suppress test stack 2023-06-16 12:20:24 +02:00
Lachlan 2a683e7774
Merge pull request #9916 from eclipse/jetty-12.0.x-PR9903-Merge
Merge PR #9903 to Jetty-12 (PerMessageDeflateExtension callback completion)
2023-06-16 14:23:22 +10:00
Greg Wilkins 926a15aa62
fixing JPMS and reactivating the tests (#9911)
* WIP fixing JPMS and reactivating the tests

* fix jndi demos with jpms activated

Signed-off-by: Olivier Lamy <olamy@apache.org>

---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
Co-authored-by: Olivier Lamy <olamy@apache.org>
2023-06-16 12:52:11 +10:00
Olivier Lamy 4753200a28
guava 32.0.1 (#9917)
Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-06-16 12:50:39 +10:00
Lachlan 62a3030b22
Merge pull request #9914 from eclipse/jetty-12.0.x-StartArgsNPE
prevent potential NPE from StartArgs in Jetty-12
2023-06-16 12:49:06 +10:00
Lachlan Roberts 5d4fa756a0 Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-06-16 08:11:28 +10:00
Lachlan Roberts ed56972056 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-06-16 08:00:26 +10:00
Lachlan 5b1e7bd549
Merge pull request #9903 from eclipse/jetty-10.0.x-9895-MessageTooLarge
Issue #9895 - ensure callback is failed after error in PerMessageDeflateExtension
2023-06-16 08:00:13 +10:00
Lachlan Roberts c70b940751 prevent potential NPE from StartArgs
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-16 07:46:32 +10:00
Lachlan Roberts 5dcf022d66 use Request.setContext in all places done in Jetty-11
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-16 07:39:48 +10:00
Lachlan 58cee22ba4
Merge pull request #9908 from eclipse/jetty-12.0.x-PR9891
Merge PR #9891 to Jetty-12
2023-06-16 07:24:38 +10:00
Ludovic Orban 8e79c1b58b
Add `EventsHandler` API (#9901)
* #8885 add EventsHandler API

Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-15 17:31:11 +02:00
Jan Bartel 9e4dc46a3e
Pause before checking session eviction (#9893)
* Pause before checking session eviction

* Change after review
2023-06-15 14:26:18 +02:00
Jan Bartel 69964468bb
Issue #9906 Empty path info (#9907)
* Issue #9906 Empty path info

* Update jetty-ee10/jetty-ee10-servlet/src/test/java/org/eclipse/jetty/ee10/servlet/ServletContextHandlerTest.java

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>

* Update jetty-ee9/jetty-ee9-servlet/src/test/java/org/eclipse/jetty/ee9/servlet/ServletContextHandlerTest.java

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>

---------

Co-authored-by: Olivier Lamy <oliver.lamy@gmail.com>
2023-06-15 12:13:21 +02:00
Lachlan 28bfaf30b2
Merge branch 'jetty-10.0.x' into jetty-10.0.x-9895-MessageTooLarge 2023-06-15 17:50:43 +10:00
Lachlan Roberts 48367f3baf Merge remote-tracking branch 'origin/jetty-11.0.x' into jetty-12.0.x 2023-06-15 13:56:28 +10:00
Lachlan Roberts 6b3d9ecd97 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2023-06-15 13:18:59 +10:00
Lachlan 54fab3dae0
Merge pull request #9891 from eclipse/jetty-10.0.x-9682-WebSocketBufferLeak
Issue #9682 - notify WebSocket message sinks of connection close
2023-06-15 13:18:38 +10:00
Lachlan Roberts e4c79c551c Scope the request to the current ContextHandlers ApiContext
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-15 11:18:05 +10:00
Lachlan Roberts d00391e86e Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-ContextHandlerClassLoading 2023-06-15 10:20:17 +10:00
Lachlan Roberts c015819936 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-9895-MessageTooLarge 2023-06-15 08:28:22 +10:00
Lachlan Roberts 212ea5e6f8 add comment in the PerMessageDeflateExtension IncomingFlusher
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-15 08:27:26 +10:00
Jan Bartel 4e316dbf62
Jetty 12.0.x ee9 serverpush tck (#9902)
* Make a test case to resemble a failing tck test

* Add more test cases more like the tck test

* Fixed processing of EOF frames for pushed requests.

Before, the EOF frame was not added to the HTTP2Stream queue.
When the pushed request was completing it tried to consume the available content, but it was not finding EOF and so was emitting a reset frame, causing the TCK failure.

Now the EOF frame is always added to the HTTP2Stream queue, so it is properly consumed when completing the pushed request.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Fix H2 trailers frames

Signed-off-by: Ludovic Orban <lorban@bitronix.be>

---------

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2023-06-14 14:22:45 +02:00
Lachlan Roberts b0923b2fd9 Issue #9396 - fixes to resolve WebSocket JPMS warnings
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-14 18:01:21 +10:00
Greg Wilkins 963d33111e
Jetty 12 idletimeout (#9905)
* IdleTimeout review

 + pass TimeoutException through all APIs
 + HttpConnection now passes on TimeoutException to HttpChannel.onFailure
* More ServerTests for idletimeout

* Recreated a ServerTimeoutsTest for multiple transports

* more robust tests

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* merged work from @sbordet and @gregw

* Various improvements to CyclicTimeouts.
* Improved reset of the earliest timeout before iteration.
* Removed check for getExpireNanoTime() == -1, since it's a valid value.
* When onExpired(Expirable) returns false, the Expirable should arrange to move its timeout in the future.

* fix keystore to please BoringSSL + use correct temp path

Signed-off-by: Ludovic Orban <lorban@bitronix.be>

* Fixed ErrorResponseAndCallback succeeded() and failed() to call super.failed() in all cases to complete the wrapped callback.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Revert "Fixed ErrorResponseAndCallback succeeded() and failed() to call super.failed() in all cases to complete the wrapped callback."

This reverts commit 5ac57c13e0.

* WIP idleTimeout

* WIP idleTimeout

* Added context wrapper for idle timeout listener

* updates from review

---------

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2023-06-14 09:57:10 +02:00
Lachlan Roberts 4c1cf7de64 PR #9878 - fixes for test failures
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-14 11:41:24 +10:00
Lachlan Roberts a67e48d1ee Merge remote-tracking branch 'origin/jetty-12.0.x' into jetty-12.0.x-ee9-ContextHandlerClassLoading 2023-06-14 10:31:51 +10:00
Lachlan Roberts f89defcf2f Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-9682-WebSocketBufferLeak 2023-06-14 10:23:13 +10:00
Greg Wilkins d3e88a95fe
Jetty 12.0.x custom request log #8819 (#9896)
* Resolve #8819 CustomRequestLog improvement

Resolves #8819 CustomRequestLog improvements:
 + only add extra detail if the log is a CustomRequestLog
 + add extra detail as a record
 + get authentication state directly from request attribute

* protect against null core request

* protect against null core request

* Use nanotime for logged latency
2023-06-13 11:12:45 +02:00
Lachlan Roberts 81447c3e2c Issue #9895 - ensure callback is failed after error in PerMessageDeflateExtension
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-13 13:02:28 +10:00
Simone Bordet 85407aabdb
Updated deploy documentation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-12 17:21:05 +02:00
Simone Bordet 601bd687aa
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-11 19:12:59 +02:00
Simone Bordet a15285aa6c
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-11 19:10:54 +02:00
Almas Abdrazak c2b9582c5f
FIxes #9150 - Use default HttpExchange#setStreams implementation
Right now the JettyHttpExchangeDelegate#setStremas implementation just sets given parameters to respective steams. However, the default JDK implementation of HttpExchange#setStreams calls #ExchangeImpl.setStreams which in turn
only changes the respective streams when given parameters aren't null.
To follow this convention the  JettyHttpExchangeDelegate#setStremas was
rewritten to follow the same convention
2023-06-11 19:10:11 +02:00
Simone Bordet 0a9bbde6d0
Merged branch 'jetty-11.0.x' into 'jetty-12.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-11 19:09:02 +02:00
Simone Bordet 84e5d8f3d3
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-11 19:08:27 +02:00
Almas Abdrazak 082f5e042c
Fixes #6140 - JMX total number of keys in SelectorManager
Added a new JMX property in SelectorManager that reports total number of keys from all ManagedSelectors

Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-11 19:07:08 +02:00
Simone Bordet df24485000
Various improvements to CyclicTimeouts. (#9897)
* Improved reset of the earliest timeout before iteration.
* Removed check for getExpireNanoTime() == -1, since it's a valid value.
* When onExpired(Expirable) returns false, the Expirable should arrange to move its timeout in the future.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2023-06-10 17:02:37 +02:00
Lachlan Roberts f3b925a893 PR #9878 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-09 14:10:43 +10:00
Lachlan Roberts c055fd06b5 Issue #9682 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-09 14:05:23 +10:00
Ludovic Orban d5200c6c63 #9881 add thread-safety documentation
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-08 23:55:30 +02:00
Ludovic Orban 9547104163 #9881 handle review comments
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-08 23:55:30 +02:00
Ludovic Orban b97090a6b4 #9881 manually maintain the size to avoid calling ConcurrentLinkedQueue.size()
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2023-06-08 23:55:30 +02:00
Olivier Lamy a617784e8e
Remove duplicated classes from test session, fix some to be able to run in parallel and not restarting 3rd party for each tests (#9782)
---------

Signed-off-by: Olivier Lamy <olamy@apache.org>
2023-06-09 06:47:36 +10:00
Greg Wilkins c2dc87c039
Jetty 12 #9630 dumpable context (#9885)
* Fix #9630 dumpable context

Added DumpableAttributes utility class

* fixed test format

* Updates from review
2023-06-08 21:14:04 +02:00
Jan Bartel 64b54adb9c
Remove unused ee10-demo-realm files and add distro test (#9886) 2023-06-08 18:54:10 +02:00
Jan Bartel 1bc1aacbe7
Fix redirect demo; fix links to sources for demos; fix blog link (#9890)
* Fix redirect demo; fix links to sources for demos; fix blog link

* Update jetty-home/src/main/resources/modules/demo.d/root/index.html

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

---------

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2023-06-08 18:24:08 +02:00
Jan Bartel 4ec7dc73f6
Jetty 12.0.x 9072 move core ee classes (#9883)
* Issue #9072 refactor jetty-ee module to remove it

* Remove old ee imports in module-info.javas

* Remove jetty-ee from deps

* Fix references to jetty-ee for osgi

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

Co-authored-by: Greg Wilkins <gregw@webtide.com>

---------

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2023-06-08 18:22:57 +02:00
Jan Bartel c13c869e3d
Jetty 12.0.x 9760 fix cookie parsing (#9894)
* Add test to show failure

* Fix #9760 EE9 Cookies

Fix #9760 Only set path and domain if they are not blank

* Fix #9760 EE9 Cookies

Fix #9760 Only set path and domain if they are not blank
Switch on violation rather than type

* Handle legacy cookie version and comment

* Handle cookie version and comment

---------

Co-authored-by: gregw <gregw@webtide.com>
2023-06-08 18:20:39 +02:00
Lachlan Roberts 0fd8bd2b2f Issue #9682 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2023-06-08 20:05:02 +10:00