Commit Graph

22939 Commits

Author SHA1 Message Date
olivier lamy 5b95f2e8ea add-opens for jdk16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 9982b5dbd3 add-opens for jdk16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 0e0a122444 add-opens to fix infinispan with java16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 1ebe7b9453 add-opens to fix infinispan with java16
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
Simone Bordet c329c4ca09 Updated CI builds to use Java 16.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-29 11:36:23 +10:00
Greg Wilkins 0d71185e10
Fix #6305 Optimise isProtectedTarget (#6306)
* Fix #6305 Optimise isProtectedTarget

Fix #6305 Optimise isProtectedTarget by using case insensitive Index.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fix #6305 Optimise isProtectedTarget

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Fix #6305 Optimise isProtectedTarget

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-05-28 18:01:25 +10:00
Jan Bartel 9e03775a7f
Issue #5684 Re-enable ValidUrlRuleTest.test(In)ValidShamrock (#6316)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-25 15:41:26 +10:00
Jan Bartel b0cd198b1b
Issue #6268 Log max form size exceeded msg. (#6301) (#6319)
* Issue #6268 Log max form size exceeded msg.

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-25 15:39:01 +10:00
Simone Bordet cfcb2efa80
Fixes #6276 - Support non-standard domains in SNI and X509. (#6296) (#6311)
* Fixes #6276 - Support non-standard domains in SNI and X509. (#6296)

Improved support for IP addresses in X509 (after #5379).
Introduced SslContextFactory.Client.SniProvider to allow applications to specify the SNI names to send to the server.
Improved logging of SNI processing.
Skip X509 matching over IP addresses when the host does
not look like an IP address, to avoid reverse DNS lookup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 04df6d4ec2)
2021-05-24 16:57:57 +02:00
Olivier Lamy aec0128f36
Update VERSION.TXT jetty-10.0.x (#6314)
* Updating VERSION.TXT

* add jetty-9.4.41.v20210516  in VERSION.TXT

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-24 15:49:58 +10:00
Jan Bartel 725236743f
Issue #6309 remove duplicate commented out session test (#6310)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-24 12:48:41 +10:00
Jan Bartel 19db66c8a5
Issue #6138 Fix flakey DuplicateCookieTest (#6307)
* Issue #6138 Fix flakey DuplicateCookieTest

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-24 10:22:59 +10:00
Simone Bordet 448f7653ff Updated build-resources POM to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:14:30 +02:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Lachlan cd73338b84
Remove WebSocketComponents & HouseKeeper on Server restart. (#6218)
* Remove WebSocketComponents & HouseKeeper on Server restart.
* Add testing for cleanup of websocket when stopping server.
* Add removeFilterHolder and removeFilterMapping methods on ServletHandler.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-20 14:48:23 +02:00
Simone Bordet 802d32d2a8 Fixes #6207 - Make ALPN optional in HTTP2Client over TLS
Introduced HTTP2Client.setUseALPN(boolean) to configure whether to use ALPN.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-20 12:27:31 +02:00
Lachlan 455e798906
Merge pull request #6293 from eclipse/jetty-10.0.x-6287-WebSocketClientClassLoading
Issue #6287 - fix classloading for WebSocketClient in webapp
2021-05-20 17:55:41 +10:00
Simone Bordet 67e2b4af2f
Fixes #5306 - Default jetty.*.acceptors should be 1. (#6236)
* Fixes #5306 - Default jetty.*.acceptors should be 1.

Changed the acceptor default to 1, with -1 calculating a value based on the number of cores.
Updated documentation.
Fixed a glitch in ManagedSelector.getMaxSelectedKeys() to return long, not double.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-20 09:34:07 +02:00
Ludovic Orban 1d5d8071ba review comments
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-05-19 17:23:01 +02:00
Ludovic Orban 6ed64e1e65 fix HttpChannelOverHTTP2 recycling order to make sure no demanding content can be left pending
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-05-19 17:23:01 +02:00
Lachlan Roberts 0761aee75a Disable websocketProvidedByWebApp on JDK14-15 due to JDK-8244090 bug.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-20 01:17:42 +10:00
Jan Bartel 65ef393262
Issue #6291 Fix FileSessionDataStoreTest.testCleanOrphans (#6292)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-19 19:06:04 +10:00
Ludovic Orban 61f4dbecdc review comment: improve readability
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-05-19 09:38:28 +02:00
Ludovic Orban 0b97b8415b only release connection when channel got released to avoid double connection release race condition
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-05-19 09:38:28 +02:00
Lachlan Roberts 779cf4ccbc Issue #6287 - improve testing & changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-19 11:24:15 +10:00
Lachlan Roberts d7c42bb49a Issue #6287 - fix classloading for WebSocketClient in webapp
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-18 17:51:26 +10:00
Simone Bordet 92f6eabb26 Fixes #6272 - Reduce allocation in HttpClient when notifying content listeners.
Avoid to allocate ContentListeners for every response.
Avoid using Java streams to reduce allocation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-17 10:28:28 +02:00
Simone Bordet 27db8ed65b
Fixes #6251 - Use CyclicTimeout for HTTP2Streams. (#6267)
* Fixes #6251 - Use CyclicTimeout for HTTP2Streams.

Introduced CyclicTimeouts to manage many entities that may timeout.
Rewritten HttpDestination request timeouts using CyclicTimeouts.
HTTP2Stream does not inherit from IdleTimeout anymore; now a
CyclicTimeouts in HTTP2Session manages the stream timeouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-16 20:37:33 +02:00
Greg Wilkins 804630d41e
Jetty 10.0.x servletholder copy #6280 (#6281)
Copy ServletHolder class/instance properly during startWebapp (#6214)
ServletHolder.copyClassServlet() method added to correctly copy held class.
Cherry picked from 9.4

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-05-16 20:01:03 +10:00
Jan Bartel cd6462a625
Issue #6277 Better handling of exceptions thrown in sessionDestroyed (#6278)
* Issue #6277 Better handling of exceptions thrown in sessionDestroyed

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-05-16 09:45:50 +10:00
Greg Wilkins 292a9fb52c
Fixes #2627 - Improve QoSFilterTest (#6120)
* Fixes #2627

Reenable disabled test with longer sleep time

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* update from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-05-16 08:35:53 +10:00
Joakim Erdfelt 4204526d2f
Merge pull request #6260 from eclipse/jetty-10.0.x-3764-DeprecationWarning
Fix #3764 DeprecationWarning decorator
2021-05-12 11:03:53 -05:00
Lachlan f58dbedcd0
Fixes #6263 - Review URI encoding in ConcatServlet & WelcomeFilter.
Review URI encoding in ConcatServlet & WelcomeFilter and improve testing.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-12 17:14:43 +02:00
Lachlan Roberts 8fee07aca8 Issue #6205 - Fix serialization issues in OpenIdAuthenticator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-05-12 17:10:22 +02:00
Joakim Erdfelt df68a1229c
Merge pull request #6255 from eclipse/jetty-10.0.x-start-tag-name
Expose buildNumber properly in `--list-config`
2021-05-12 08:49:28 -05:00
Greg Wilkins f26af79d38 Fix #3764 DeprecationWarning decorator
Add in doStart

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-05-12 20:46:43 +10:00
Simone Bordet de2d764290 Fixes #6254 - Total timeout not enforced for queued requests.
Fixed logic in HttpDestination.RequestTimeouts, where now a timeout
is scheduled only when the expiration time is less than the existing one.
Various code cleanups.
Renamed HttpDestination.TimeoutTask to RequestTimeouts for clarity.
Improved javadocs, code comments and logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 5f23689aa7)
(cherry picked from commit da50e06b64)
(cherry picked from commit 88ac10439a)
2021-05-12 10:19:11 +02:00
Joakim Erdfelt 3b7957cfb0
Expose buildNumber properly in `--list-config`
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-05-11 12:34:59 -05:00
Simone Bordet 54e47612f2
Fixes #6250 - Lazily allocate HTTP2Stream data queue. (#6252)
* Fixes #6250 - Lazily allocate HTTP2Stream data queue.

Now the data queue is lazily allocated.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-11 13:23:09 +02:00
Ludovic Orban c3c51a164e make sure the stream is not null before using it
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-05-11 08:34:36 +02:00
Simone Bordet b5b3874275 Fixes #6099 - Cipher preference may break SNI if certificates have different key types.
Updated the logic in SslContextFactory.Server.sniSelect(...) to check if there is
any certificate that matches, and if so return a null alias in the hope to be called
again and pick the right alias for the SNI.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 68296911b7)
2021-05-10 12:25:56 +02:00
Lachlan e9f260f4c3
Issue #6205 - Fix issues with OpenID redirecting to wrong URI (#6211)
Use the OpenID state param to map to the redirect URI.
2021-05-10 15:19:07 +10:00
Simone Bordet 1c34222415 Fixes #6159 - Jetty with Conscrypt unable to handle any HTTPS requests when connected by IP rather than hostname.
Added null guard for `ExtendedSSLSession.getRequestedServerNames()`
which should never return null, but it does when using Conscrypt.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-07 15:52:24 +02:00
Simone Bordet d3576a883e Fixes #6238 - jetty-keystore Invalid manifest header Bundle-SymbolicName.
Added POM property that specifies the bundle name.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-07 09:41:44 +02:00
Olivier Lamy 04e5c4e077
Issue #6224 make jspc mojo maven threadsafe (#6230)
* Issue #6224 make jspc mojo maven threadsafe

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* restore previous behaviour

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-07 12:07:16 +10:00
Simone Bordet 8d46d3fc8f Added hint to use java -version to report the Java version/vendor.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit e5f28dbc16)
2021-05-06 22:14:35 +02:00
Simone Bordet ebeb6dd21b Point to jetty:help when redeployment is disabled.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-06 12:05:12 +02:00
Simone Bordet f575c65016 Merge branch 'inform-user-default-scan-mode' of git://github.com/dana-whitelow/jetty.project into dana-whitelow-inform-user-default-scan-mode 2021-05-06 11:59:57 +02:00
Greg Wilkins 1263732576
Fix #6227 Async timeout dispatch race (#6228) (#6231)
Fix #6227 Async timeout dispatch race
Only allow the thread calling onTimeout to call dispatch and complete once timeout has expired.
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-05-06 07:45:27 +10:00
Olivier Lamy 2b78094546
Upgrade h2spec maven plugin 1.0.5 (#6229)
* Upgrade h2spec maven plugin 1.0.5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* use release h2spec-maven-plugin 1.0.5

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-05 21:22:47 +10:00