Commit Graph

17869 Commits

Author SHA1 Message Date
olivier lamy 5ee6b67e0a align with 10.0.x to ease merging
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 07:29:56 +10:00
Olivier Lamy 78992a126c
Start a mongo instance for testing using docker via java code (#4840)
* remove slow mongo maven plugin which was forking an external process and now run mongodb in a container so we can even now test with different version using -Dmongo.docker.version

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-08 07:06:03 +10:00
Ludovic Orban 072cc978fb
add HttpConfiguration.Customizer implementation that sets request attributes containing the real local and remote address:port pairs (#4849)
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-05-07 19:53:15 +02:00
Joakim Erdfelt c50a52a392
Merge pull request #4844 from lorban/jetty-9.4.x-4843-proxyv2-ignored-address-length
proxy v2 skip address length bytes when LOCAL command is specified
2020-05-07 10:16:57 -05:00
Joakim Erdfelt e4fd49dc36
Merge pull request #4838 from eclipse/jetty-9.4.x-4835-gziphandler-flush
Issue #4835 - Addressing flush/commit with GzipHttpOutputInterceptor
2020-05-05 09:54:41 -05:00
Ludovic Orban d34cb2598b proxy v2 skip address length bytes when LOCAL command is specified
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-05-05 13:51:30 +02:00
Simone Bordet 0ab2b42055
Merge pull request #4823 from eclipse/jetty-9.4.x-4798-recover_selector_failures
Issue #4798 - Recover from Selector Failures
2020-05-04 17:43:28 +02:00
Joakim Erdfelt d58da0f7d2
Issue #4824 - Addressing flush/commit with GzipHttpOutputInterceptor
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-05-04 09:22:08 -05:00
Simone Bordet 2fa161c515
Merge pull request #4790 from eclipse/jetty-9.4.x-4778-sni_with_one_certificate
Fixes #4778 - Enforcing SNI when there are only non-wildcards certifi…
2020-05-04 11:35:04 +02:00
Joakim Erdfelt c645d0f7c4
Issue #4835 - Addressing flush/commit with GzipHttpOutputInterceptor
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-05-01 14:42:08 -05:00
Olivier Lamy abb26d0781
Jetty 9.4.x hazelcast fix non needed dependency (#4832)
* no need to websocket dependency in jetty-hazelcast

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

* fix dependency

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-01 11:21:42 +10:00
Simone Bordet 0a028b663b Issue #4798 - Better handling of fatal Selector failures.
More updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-30 10:55:29 +02:00
Simone Bordet ac97bc3b31
Merge pull request #4803 from lorban/jetty-9.4.x-channel-recycling-h2
Solve lock contention creating HTTP2 streams (#2188) …
2020-04-29 15:18:50 +02:00
Ludovic Orban 6729a6f689 Solve lock contention creating HTTP2 streams (#2188) while fixing race condition that breaks http channels recycling (#4695)
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-04-29 14:25:51 +02:00
Simone Bordet 8c75eeccce Issue #4798 - Better handling of fatal Selector failures.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-29 11:57:06 +02:00
Joakim Erdfelt 3998e657cc
Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x 2020-04-28 13:45:29 -05:00
Joakim Erdfelt 85e3a4b5a6
Merge remote-tracking branch 'origin/jetty-9.2.x' into jetty-9.3.x 2020-04-28 13:44:12 -05:00
Joakim Erdfelt ce78b195d1
Merge pull request #4811 from eclipse/jetty-9.2.x-old-android-workarounds
Issue #4819 - Workarounds for old (pre API 24) Android SDKs
2020-04-28 11:31:12 -05:00
Jan Bartel e2af6419ae
Issue #4820 jetty-deployer.xml should be jetty-deploy.xml for osgi (#4821)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-28 11:38:38 +02:00
Greg Wilkins 8fcbf6d590
Improve Attributes Handling (#4816)
* Spun out from #4814 Improve Attributes Handling

Improve attribute handling to reduce garbage and improve lookup.
Introduced a Wrapper so that request can remove any layers on reset.

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

* Issue #4814 - Exposing AttributeMap.getAttributeNameSet() on Attributes.

The underlying AttributesMap already has a .getAttributeNameSet()
method, expose it on the Attributes interface.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Allow a set to override a secure attribute.

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

* Issue #4814 - Attributes.getAttributeNames() is now defaulted

The Attributes.getAttributeNames() will use the
.getAttributeNameSet() by default now.

Updated all Attributes.Wrapper impls to use this new behavior

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-04-28 10:16:29 +02:00
Simone Bordet 8929791e6c
Merge pull request #4791 from eclipse/jetty-9.4.x-4787-mutable_host_port_client_request
Fixes #4787 - Make org.eclipse.jetty.client.HttpRequest's host name w…
2020-04-27 23:29:29 +02:00
Simone Bordet 952a20f81c Issue #4798 - Better handling of fatal Selector failures.
Implemented selector recovery by transferring
all keys to a newly created selector.

Updated code so that it does not assume that the
SelectionKey never changes.
2020-04-27 23:19:06 +02:00
Simone Bordet 46ad90598c Code cleanups. 2020-04-27 22:57:57 +02:00
Jan Bartel 3c1f42c1c7 Issue #4818
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-27 16:12:44 +02:00
Joakim Erdfelt 26e6979ce2
Issue #4819 - Rework SSL/TLS methods to allow use on Android API 23 (or older)
* Workaround missing SSLEngine.getHandshakeSession()
* Workaround missing SSLParameters.setEndpointIdentificationAlgorithm()

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-04-27 09:00:50 -05:00
Jan Bartel b593f67048 Issue #4818 Fix jsp doc
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-27 15:52:28 +02:00
Jan Bartel ed486f1d3e Issue #4817 Fix jsp doco
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-27 15:32:51 +02:00
olivier lamy 32aa5d6453 not sure if it is used but at least we will not hit this repo when building
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-22 14:52:14 +10:00
Simone Bordet fe7f71fda1 Excluding the "external" tests to make builds in Jenkins more reliable.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-19 16:47:49 +02:00
Simone Bordet 78e697d0a0 Fixes #4787 - Make org.eclipse.jetty.client.HttpRequest's host name writable.
For some historical reason, host and port were not mutable after the request
was created. Since many other key parameters are mutable (e.g. the scheme)
it makes sense to make host and port mutable too.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-18 21:52:27 +02:00
Simone Bordet 426c80bf6d Fixes #4778 - Enforcing SNI when there are only non-wildcards certificates.
If SNI is required, wrap the KeyManagers with SniX509ExtendedKeyManager.
Updated the main keystore file to only have one certificate (instead of two),
since there never was the need for two certificates in the tests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-18 18:15:03 +02:00
Simone Bordet 15f7e0671b Issue #4443 - Track backport of ALPN APIs to Java 8.
Removed Java 8 profiles, not needed anymore.
Jetty 9.4.x requires Java 9+ to be built, in order to build Java 9 specific modules.
The ALPN boot jar used in tests was either replaced by the ALPN agent or the tests only run in Java 9+.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-18 16:21:36 +02:00
Olivier Lamy fb8c8270b3 upgrade spifly to 1.2.4 and replace jdk13 build with jdk14 (#4780)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-04-16 11:20:43 +10:00
Lachlan 4388c376ba
Merge pull request #4704 from eclipse/jetty-9.4.x-4235-OpenIdErrors
Issue #4235 - communicate reason of OpenID auth failure to error page
2020-04-15 09:42:06 +10:00
Simone Bordet 0953a93335
Merge pull request #4768 from eclipse/jetty-9.4.x-4764-http2_content_length
Fixes #4764 - HTTP2 Jetty Server does not send back content-length.
2020-04-14 23:31:21 +02:00
Lachlan Roberts 0de5976651 Issue 4235 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-04-14 21:34:26 +10:00
Simone Bordet 0e30d6b751 Fixes #4764 - HTTP2 Jetty Server does not send back content-length.
Fixed InterleavingTest that was using the wrong MetaData.Response constructor.
Fixed handling of HEAD methods in HttpTransportOverHTTP2.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-14 13:05:24 +02:00
Simone Bordet 3e96bf8621 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4764-http2_content_length'. 2020-04-14 11:45:48 +02:00
Simone Bordet 2e85b3e169 Fixes #4764 - HTTP2 Jetty Server does not send back content-length.
Updates after review.
Now the Content-Length header is generated by HpackEncoder based on
MetaData.contentLength, so that the MetaData.HttpFields are not modified.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-14 11:44:58 +02:00
Simone Bordet dc89f7f264 Fixes #4764 - HTTP2 Jetty Server does not send back content-length.
Sending Content-Length header if known at the time of sending the
response headers.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-13 17:57:38 +02:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Joakim Erdfelt 10ddb6e673
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2020-04-08 10:14:21 -05:00
Joakim Erdfelt b9a9511914
Merge pull request #4748 from eclipse/jetty-9.4.x-4745-centralized-webapp-logging-doc
Issue #4745 - update documentation for centralized-webapp-logging
2020-04-08 10:14:12 -05:00
Michael Mayer 9079fa63b3
Improve keystore exception message when keystore is not valid (#4759)
Signed-off-by: Michael Mayer <michael@schnittstabil.de>
2020-04-08 10:13:10 -05:00
Simone Bordet 103c22dc43
Merge pull request #4754 from eclipse/jetty-9.4.x-4751-refresh_networktraffic_classes
Fixes #4751 - Refresh NetworkTraffic* classes.
2020-04-07 14:29:17 +02:00
Simone Bordet 7ef05860ee Fixes #4751 - Refresh NetworkTraffic* classes.
Added missing license header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-07 12:19:49 +02:00
Simone Bordet 4e3c0c8cd7 Fixes #4751 - Refresh NetworkTraffic* classes.
Introduced NetworkTrafficSocketChannelEndPoint to replace
NetworkTrafficSelectChannelEndPoint, now deprecated.

Code and javadocs cleanup.

Moved the tests to jetty-client so that also the client is tested.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-07 12:04:24 +02:00
Jan Bartel 8eb4bb98a4
@RunAs not honoured (#4743)
* Issue #4739 Fix @RunAs

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-06 11:33:09 +02:00
Jan Bartel 4b2842265a
Issue #4737 Ensure lifecycle callbacks happen for run-as and non async servlets (#4744)
* Issue #4737 Ensure lifecycle callbacks happen for run-as and non async servlets

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-04-06 11:30:33 +02:00