Commit Graph

22906 Commits

Author SHA1 Message Date
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
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
Lachlan 7555d0375a
Improve testing for temp directories (#6139)
* Improve testing for temp directories (#5483)

Improve testing around WebAppContext temporary directories.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-30 16:05:49 +10:00
Lachlan f828411c16
Merge pull request #6119 from eclipse/jetty-10.0.x-6106-WebSocketCDI
Issue #6106 - Fix WebSocket/CDI integration in Jetty 10
2021-04-30 14:21:14 +10:00
Simone Bordet 7048db0910 Fixes #6208 - HTTP/2 max local stream count exceeded (#6220)
Forward port of #6220 from jetty-9.4.x to jetty-10.0.x.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry-picked from commit 2f19c67b41)
2021-04-29 14:51:10 +02:00
Jan Bartel f05fc25900
Issue #6153 Swap order of jetty maven plugin jvmArgs for EXTERNAL (#6155)
* Issue #6153 Swap order of jetty maven plugin jvmArgs for EXTERNAL

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-04-29 11:18:38 +10:00
Ludovic Orban 973dfcf4f7 consumeAll: fail content with static exception except when debug logs are enabled + move exception management from HttpInput to ContentProducer
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-04-28 13:15:51 +02:00
Simone Bordet 78dc11b648 Documented WebSocketClient.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-27 11:04:42 +02:00
Simone Bordet 8b10f3ebd5 Documented WebSocketClient.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-27 11:04:42 +02:00
Lachlan Roberts a0cca858a7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-6106-WebSocketCDI 2021-04-27 16:15:52 +10:00
Lachlan 3b88b4713c
Merge pull request #6176 from eclipse/jetty-10.0.x-5817-CustomRequestLogFiltering
Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate
2021-04-27 16:04:54 +10:00
Olivier Lamy 1294222797
Upgrade commons-io 2.7 (copy of https://github.com/eclipse/jetty.project/pull/6213) (#6216)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-27 15:59:18 +10:00
Lachlan 24653e1aa0
Merge pull request #6215 from eclipse/jetty-10.0.x-FixTypo
Use correct logger in AvailableEncoders.
2021-04-27 15:56:04 +10:00
Lachlan Roberts ce8ede5c71 Use correct logger in AvailableEncoders.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-27 10:38:42 +10:00
Lachlan 3e366e6c0b
Merge pull request #6198 from eclipse/jetty-10.0.x-WebSocketEncoderDecoderLifeCycle
Ensure that javax.websocket Encoder/Decoder destroy method is called.
2021-04-27 10:32:28 +10:00
Olivier Lamy cda38abbad
Issue #5798 fix jetty runner startup error and add jsp support as well (#6115)
* Issue #5798 fix jetty runner startup error and add jsp support as well

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

* Add test to ensure jetty runner starts correctly

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

* remove unused imports

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

* fix help description

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

* improvement based on Joakim comment, add it test with the path

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-27 10:26:33 +10:00
Lachlan 894e4f400b
Merge pull request #6195 from eclipse/jetty-10.0.x-MigrationGuide
Add migration guide for WebSocket changes between 9.4 and 10.
2021-04-27 09:59:55 +10:00
Lachlan Roberts 988e158db3 Improve javadoc for CustomRequestLog.setFilter
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-26 16:46:53 +10:00
Simone Bordet 1b6fb39867 Re-enabled ConnectionStatisticsTest.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-22 15:49:15 +02:00
Lachlan Roberts 5b13006a59 Make AvailableEncoders & AvailableDecoders implement Closable.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 21:46:28 +10:00
Lachlan Roberts 564eea07c7 Fix header links in websocket migration guide.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 10:54:26 +10:00
Simone Bordet 9176d83423 Improvements to the Jetty documentation.
Clarified that HttpClient cannot be stopped from its own threads.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-20 17:41:07 +02:00
Lachlan Roberts a24a15a97a Add code example for WebSocket migration guide.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-21 00:31:12 +10:00
Simone Bordet d3a8817c76 Improvements to the Jetty documentation.
Added section about multiple key/certificate entries in a KeyStore.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-20 12:34:17 +02:00
Lachlan Roberts ab08d1a1c6 Ensure that javax.websocket Encoder/Decoder destroy method is called.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-20 11:11:05 +10:00
Ludovic Orban 25467f8904 Improve handling of HttpInput.Interceptor behavior
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-04-19 10:32:23 +02:00
Lachlan Roberts df312ccf0c Add basic migration guide for WebSocket changes between 9.4 and 10.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-19 18:28:08 +10:00
Lachlan 4c98990cd9
Create FileBufferedResponseHandler to buffer responses into a file. (#6010)
FileBufferedResponseHandler adds an HttpOutput.Interceptor to buffer all responses into a file until the output is closed. This allows the commit to be delayed until the response is complete and thus headers and response status can be changed while writing the body.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-19 11:02:44 +10:00
zahid 35b64fadd7 inform user of default scane mode and restructure wording 2021-04-16 19:35:56 +01:00
Simone Bordet b872c1d751 Improvements to the Jetty documentation.
Added link to Eclipse Jetty main site.
Removed unused "breadcrumb" attribute.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-16 17:04:01 +02:00
Chris Walker d825299da4
Fixing documentation pom values (#6181) 2021-04-15 18:19:50 -05:00
Lachlan dab26c601d
Merge pull request #6170 from eclipse/jetty-10.0.x-6166-MessageInputStream
Issue #6166 - fix bug in the MessageInputStream byte array read
2021-04-15 20:16:06 +10:00
Lachlan 054069fa59
Merge pull request #6171 from eclipse/jetty-10.0.x-WebSocket-DisabledSessionTest
Re-enable disabled tests for the WebSocket SessionTest
2021-04-15 20:13:33 +10:00
Lachlan Roberts 61ead137b2 Fix intellij warnings in CustomRequestLogTest.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 19:04:30 +10:00
Lachlan Roberts 382aed8374 Issue #5817 - allow CustomRequestLog to be filtered with BiPredicate
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-15 19:03:50 +10:00