19574 Commits

Author SHA1 Message Date
Simone Bordet
2ebd1ff62d Fixes merge from branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-10 10:42:51 +02:00
Simone Bordet
6430177685 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-10 10:38:38 +02:00
Simone Bordet
53ed8f346c
Merge pull request #4178 from eclipse/jetty-9.4.x-4177-http_proxy_sslcontextfactory
Fixes #4177 - Configure HTTP proxy with SslContextFactory.
2019-10-10 10:02:48 +02:00
Simone Bordet
a73568df28 Fixes #4177 - Configure HTTP proxy with SslContextFactory.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-10 10:00:17 +02:00
Lachlan
00baa7147e
Merge pull request #4153 from eclipse/jetty-9.4.x-3558-websocket_onErrorAfterClose
Issue #3558 - only notify WS onError if onClose has not been called
2019-10-10 15:27:11 +11:00
Chris Walker
5d08fc84d3
Removed Continuations doc and unnecessary references. Resolves #4004 2019-10-09 16:57:35 -04:00
Simone Bordet
c8175ec107 Fixes #4177 - Configure HTTP proxy with SslContextFactory.
It is now possible to pass a `SslContextFactory.Client` to HttpProxy
so that it is possible to use a keystore for the proxy communication
and another keystore for the server communication.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-09 17:37:00 +02:00
Simone Bordet
d4febdf4bd Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-09 10:25:33 +02:00
Simone Bordet
b48873f33b Issue #4170 - Client-side alias selection based on SSLEngine.
Cosmetics.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-09 10:23:22 +02:00
Simone Bordet
783f3b49b0 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-09 10:22:18 +02:00
Simone Bordet
0fc5ec9d18
Merge pull request #4171 from eclipse/jetty-9.4.x-4170-client_side_alias_selection
Fixes #4170 - Client-side alias selection based on SSLEngine.
2019-10-09 09:30:37 +02:00
Greg Wilkins
0bd71a4359
Pathwatcher Concurrent modification #4174 (#4175)
There is a race between the doStop clearing the key map and the watching thread
checking isRunning before iterating over the key map.

While more sophisticated approaches could be used, I think that is best to defer
until this class is reworked entirely.  For now just using a ConcurrentHashMap will
avoid the exception and the closing of the pathwatcher will prevent watching forever.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-09 13:58:16 +11:00
Greg Wilkins
31a0180133 Improve debug logging of gzip inflation
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-09 11:51:13 +11:00
Greg Wilkins
8087e29211 Reverted getSession(id) to public
This method is used by third party session handlers.
Reverts change made as part of #3913

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-09 11:46:43 +11:00
Chris Walker
6e9f7479cb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-10-08 15:22:36 -04:00
Chris Walker
3328a28f09
Added instructions for a shaded start.jar maven dependency. Resolves #2407 2019-10-08 15:21:59 -04:00
Simone Bordet
742f564332 Fixes #4170 - Client-side alias selection based on SSLEngine.
Fixed setting of host/port in AbstractConnectorHttpClientTransport
and HttpProxy so that the creation of SSLEngine can use the proper
host/port pair, and can be subsequently used in TLS components.

Introduced SslContextFactory X509ExtendedKeyManagerWrapper and
X509ExtendedTrustManagerWrapper as utility classes used internally
and in tests.

The test case for this issue required 3 keystores, so other test
classes have been refactored to use the new keystores.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-08 18:32:23 +02:00
Simone Bordet
c93dddec30 Fixes #2429 - Review HttpClient backpressure semantic.
Fixes after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-08 12:18:14 +02:00
Simone Bordet
55a90fcecf Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-08 09:56:40 +02:00
Simone Bordet
7164171674 Issue #2429 - Review HttpClient backpressure semantic.
Restored tests that were commented out.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-08 09:54:41 +02:00
Simone Bordet
e2a493d7b0 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-08 09:52:21 +02:00
Greg Wilkins
1c5a53a512 test async gzip close
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-10-08 18:14:17 +11:00
Simone Bordet
f68ed50405
Merge pull request #4106 from eclipse/jetty-9.4.x-2429-httpclient_backpressure
Issue #2429 - Review HttpClient backpressure semantic.
2019-10-08 09:10:51 +02:00
Lachlan
0403f0bc85
Merge pull request #4133 from travisspencer/feature-4132
Issue #4132 - Allow token and authorization endpoints to be configured
2019-10-08 13:46:21 +11:00
Travis Spencer
1d5ceee267 Issue #4132 Allow token and authorization endpoints to be configured
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-08 01:04:34 +02:00
Simone Bordet
a4603c4237 Issue #2429 - Review HttpClient backpressure semantic.
Updated after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-08 00:52:11 +02:00
Lachlan
d47264960e
Issue #3734 - throw ISE for WebSocket suspend after close (#4095)
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-08 09:47:48 +11:00
Lachlan Roberts
3f6119eb13 Merge remote-tracking branch 'eclipse/jetty-9.4.x' into jetty-10.0.x 2019-10-08 09:33:03 +11:00
Lachlan
6e698df4d3
Merge pull request #4135 from travisspencer/4134-fix-aud
Issue #4134 - Validate audience (aud) claim as list or string, not just string
2019-10-08 09:28:22 +11:00
Lachlan
acf4eeff65
Merge pull request #4129 from travisspencer/fix-4128
Issue #4128 - Add missing padding and use URL decoder
2019-10-08 09:17:12 +11:00
Travis Spencer
1c6202658e Validate aud claim as list or string, not just string
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-06 18:00:32 +02:00
Travis Spencer
8b37a8f7fe Issue #4128 - Add missing padding and use URL decoder
Signed-off-by: Travis Spencer <travis@curity.io>
2019-10-05 18:06:26 +02:00
Jesse Wilson
d4270d9e97 Better advice for skipping tests in README.md (#4157)
This causes test artifacts to be built even though tests are not run.

Signed-off-by: Jesse Wilson <jwilson@squareup.com>
2019-10-05 08:32:16 +10:00
Lachlan Roberts
d95c825c5c Issue #3558 - only notify WS onError if onClose has not been called
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-10-04 11:13:38 +10:00
Joakim Erdfelt
d7a189fa18 Updating to version 10.0.0-SNAPSHOT 2019-10-03 12:05:26 -05:00
Joakim Erdfelt
fd6a2cb9f6 Updating to version 10.0.0.alpha1 2019-10-03 11:25:06 -05:00
Simone Bordet
ef05f730e6 Issue #4115 - Drop HTTP/2 pseudo headers.
Added Javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-03 16:58:16 +02:00
Simone Bordet
3be178c966 Merged 'jetty-9.4.x' into 'jetty-9.4.x-2429-httpclient_backpressure'. 2019-10-03 13:17:39 +02:00
Simone Bordet
3f27eb9a0e
Merge pull request #4151 from eclipse/jetty-10.0.x-4150-jpms_proxy_alpn_client
Fixes #4150 - Module org.eclipse.jetty.alpn.client not found, require…
2019-10-03 10:16:37 +02:00
Joakim Erdfelt
5ef5ec6c28
Fixing build
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-02 16:48:54 -05:00
Joakim Erdfelt
b4960f36e5
Removing javadoc:aggregate for release script 2019-10-02 16:14:13 -05:00
Simone Bordet
9fbc41f1d5 Fixes #4150 - Module org.eclipse.jetty.alpn.client not found, required by org.eclipse.jetty.proxy
Made jetty-alpn-client required by jetty-client.
Fixed groupId for test-proxy-webapp.
Added test case for the failing configuration.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-02 23:11:02 +02:00
Joakim Erdfelt
7a6b5f6752
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-10-02 14:43:26 -05:00
Joakim Erdfelt
c19d33dc59
Merge pull request #4149 from eclipse/jetty-9.4.x-4121-qtp-threadfactory
Issue #4121 - ThreadFactory support in QTP
2019-10-02 14:43:08 -05:00
Joakim Erdfelt
b022cffce0
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-10-02 13:49:47 -05:00
Joakim Erdfelt
ed9031bd30
Merge pull request #4143 from eclipse/jetty-9.4.x-4141-classcastexception-request-async
Fixes #4141 - Servlet not async + async Filter + wrapped request
2019-10-02 13:49:21 -05:00
Joakim Erdfelt
b121ba786b
Issue #4121 - Tests for ThreadFactory support in QTP
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-10-02 13:37:22 -05:00
Joakim Erdfelt
b82b337e8e
Merge branch 'jetty-9.4.x' into jetty-9.4.x-4121-qtp-threadfactory 2019-10-02 12:55:25 -05:00
Simone Bordet
7cf5dfdebf Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-10-02 17:07:18 +02:00
Simone Bordet
2f06976e41 Fixed flaky test and code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-10-02 17:06:45 +02:00