Commit Graph

22953 Commits

Author SHA1 Message Date
Greg Wilkins e3faf81860
Fix #6114 Deploy symlink webapps (#6317)
* Fix #6114 Deploy symlink webapps

Use Path.toRealPath rather than getCanonicalPath in the Scanner
Make following symlinks configurable

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-06-04 15:10:54 +02:00
Jan Bartel de37267ae5
Issue #6327 Fix cookie leak test (#6344)
* Issue #6327 Fix cookie leak test

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-04 15:08:53 +02:00
Lachlan Roberts 9cc7517d65 Issue #6330 - Improve javadoc for CustomRequestLog %H
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-06-04 15:05:07 +02:00
Jan Bartel f50c4fd4b4 Issue #6327 Remove an invalid RequestTest
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-04 15:04:32 +02:00
Simone Bordet 21aba4a724 Fixes #6323 - HttpClient requests with redirects gets stuck/never calls onComplete()
* Reworked the total timeout handling.
* Now a CyclicTimeouts handles the exchanges in each HttpDestination,
and a CyclicTimeouts handles the exchanges in each HttpConnection
(rather than in HttpChannel).
* Now adjusting the total timeout for copied requests generated by
redirects and authentication.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 2e7d17400f)
2021-06-04 12:12:40 +02:00
Joakim Erdfelt fbbe584a30
Merge pull request #6356 from tjwatson/jetty-10.0.x
Fixes #6354 - allow jetty bundles to use 1.7 slf4j
2021-06-03 14:42:55 -04:00
Thomas Watson 256ee34765 Fixes #6354 - allow jetty bundles to use 1.7 slf4j
This updates the parent pom to set the range for all
imports of slf4j by the jetty bundles

Signed-off-by: Thomas Watson <tjwatson@us.ibm.com>
2021-06-03 09:58:35 -05:00
Simone Bordet c151b04535 Fixes #5931 - SslConnection should implement getBytesIn()/getBytesOut(). (#6335)
Updated ConnectionStatistics to report both the stats of all connections,
and the stats grouped by connection class.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit f902d12fe8)
2021-06-03 15:16:12 +02:00
Olivier Lamy 9464c39de2
Add comment on why the test ServerWithJMXTest is disabled (#6338)
* Add comment on why this test is disabled
* Update demos/embedded/src/test/java/org/eclipse/jetty/demos/ServerWithJMXTest.java

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Co-authored-by: Jan Bartel <janb@webtide.com>
2021-06-03 13:31:19 +10:00
Jan Bartel d4a8c38b87
Issue #6347 Fix session-store-gcloud,logging-jcl-capture,logging-log4j1-capture (#6349)
* Issue #6347 Fix session-store-gcloud,logging-jcl-capture,logging-log4j1-capture

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-03 11:26:47 +10:00
Jan Bartel a55b315f14
Issue #6118 Warn if hazelcast cfg file is missing SessionDataSerializer (#6321)
* Issue #6118 Warn if hazelcast cfg file is missing SessionDataSerializer

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-02 10:34:01 +10:00
Jan Bartel b3f4a57c82
Issue #6112 Jetty logging leaking to webapp (#6336)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-06-01 10:15:49 +10:00
olivier lamy a669c5443d more --add-opens for jetty-jaas tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
olivier lamy 42153bd57f fix add-opens for cdi tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-05-29 11:36:23 +10:00
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