20103 Commits

Author SHA1 Message Date
Lachlan
584e264b0b
Clean up CustomRequestLog and fix the handling of the %u code. (#4397)
* Clean up CustomRequestLog and fix the handling of the %u code.
* Add test for logging of remote user with %u and %{d}u
* update javadoc to clarify that %u is only for servlet auth
* remove the prepended '?' when deferred authentication is checked
2019-12-17 11:28:39 +11:00
Lachlan Roberts
1e884c2497 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4407-JavaxAnnotatedConfigDefault
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-17 10:55:07 +11:00
Lachlan
ce6438c53e
Issue #4148 - config for jetty specific settings with javax WebSockets (#4295)
* Issue #4148 - config for jetty specific settings with javax WebSockets

* Make every jetty EndpointConfig implementation a wrapper
* Remove BasicEndpointConfig and use Client or Server specific ones
2019-12-17 10:04:07 +11:00
Greg Wilkins
9f93577054
Update Notice (#4395)
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-17 07:40:19 +11:00
Simone Bordet
6f2ac512dc Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-12-16 18:04:11 +01:00
Simone Bordet
fa973a2df8
Merge pull request #4380 from eclipse/jetty-9.4.x-4374-httpclient_content_listener
Fixes #4374 - Jetty client: Response.AsyncContentListener.onContent i…
2019-12-16 18:01:27 +01:00
Joakim Erdfelt
7d65183e2c
Issue #3730 - Cleaning up Scopes in WebSocketClient
+ Introducing HttpContainerScope to track HttpClient specific
  ByteBufferPool, SslContextFactory, and Executor.
+ New private WebSocketClient constructor that use HttpContainerScope
+ Deprecated many constructors as irrelevant now that HttpClient
  is an option to create a WebSocketClient.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-13 13:44:57 -06:00
Lachlan Roberts
d8f64cb510 Issue #4407 - fix broken test
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-13 14:50:50 +11:00
Lachlan Roberts
313f2e49f5 Merge remote-tracking branch 'eclipse/jetty-10.0.x' into jetty-10.0.x-4407-JavaxAnnotatedConfigDefault
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-13 11:43:36 +11:00
Lachlan Roberts
d08c1025e9 Issue #4407 - fix broken tests, ServerFHF now extends ClientFHF
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-13 11:30:01 +11:00
Lachlan Roberts
74e7cca28d Issue #4407 - clean up usage of ClientEndpointConfig and testing
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-13 10:36:49 +11:00
Joakim Erdfelt
2c464e36a2
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-12-12 14:11:51 -06:00
Joakim Erdfelt
cf7f6a52f5
Merge pull request #4417 from eclipse/jetty-9.4.x-4415-gziphandler-large-stream-support
Issue #4415 - Addressing Gzip Decoding of large files
2019-12-12 14:11:31 -06:00
Joakim Erdfelt
36d06d016d
Issue #4415 - Addressing Gzip Decoding of large files
+ Addressing PR review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-12 13:23:44 -06:00
Joakim Erdfelt
1e810d370f
Issue #4415 - Addressing Gzip Decoding of large files
+ Addressing PR review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-12 11:58:44 -06:00
Lachlan Roberts
af2a9cfd5b Issue #4407 - merge annotated ServerEndpointConfig with provided config
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-12 13:31:17 +11:00
Joakim Erdfelt
2b58379f88
Issue #4415 - Addressing Gzip Decoding of large files
+ Now applying proper RFC 1952 ISIZE check.
+ Bit shifting is done with Longs against Long value.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-11 14:38:42 -06:00
Chris Walker
ef5c7d7947
Adding documentation for test-keystore module. Resolves #4228 2019-12-11 12:35:09 -06:00
Simone Bordet
8245038a90 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-12-11 13:50:05 +01:00
Simone Bordet
fe1a3c67a1
Merge pull request #4412 from eclipse/jetty-9.4.x-4411-server_spin_incomplete_request
Issue #4411 - Jetty server spins on incomplete request.
2019-12-11 13:47:37 +01:00
Simone Bordet
8e875ab7a4 Issue #4411 - Jetty server spins on incomplete request.
Updated FastCGI code to pass the test.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-11 13:02:23 +01:00
Simone Bordet
6bbec7f3b0 Issue #4411 - Jetty server spins on incomplete request.
Fixed HttpInput to be in READY state if an error is detected
before the call to setWriteListener().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-11 00:11:29 +01:00
Jan Bartel
ef84a797e9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2019-12-10 12:31:18 +11:00
Jan Bartel
0e6a1ce76b
Issue #4402 Fix NPE in JettyRunWarExplodedMojo (#4406)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-10 12:29:40 +11:00
Lachlan Roberts
b400d00f03 Issue #4407 - tests for annotations as default ServerEndpointConfig
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-09 18:24:32 +11:00
Jan Bartel
9cfaa414a1
Issue #4238 Pass system properties into xml configurations (#4390)
* Issue #4238 Pass system properties into xml configurations

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-09 08:33:52 +11:00
Simone Bordet
941ce67e61 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-12-07 14:20:38 +01:00
Simone Bordet
2052b6e390
Merge pull request #4404 from eclipse/jetty-9.4.x-4385-restore-unsupported-exception-base-sni
Issue #4385 - Reverting WARN log in favor of IllegalStateException
2019-12-07 12:44:05 +01:00
Simone Bordet
2364b075d7 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-12-07 12:42:00 +01:00
Simone Bordet
364ded9f73
Merge pull request #4391 from eclipse/jetty-9.4.x-3512-httpclient_multipart_close
Fixes #3512 - File descriptor is not released after zip file uploaded…
2019-12-07 12:38:40 +01:00
Joakim Erdfelt
2ee079feb1
Merge 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2019-12-06 13:24:43 -06:00
Joakim Erdfelt
53eda03203
Making exception message more clear
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-06 13:24:30 -06:00
Joakim Erdfelt
53073ca257
Issue #4385 - Reverting WARN log in favor of IllegalStateException
+ Plus fleshing out the testcases more for Base / Client / Server
  with and without certificates that will trigger SNI requirement
  and ISE.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-06 13:20:24 -06:00
Lachlan
47117f88fb
Allow WebSocket extension selection to be done from UpgradeListener (#4379)
* Allow WebSocket extension selection to be done from UpgradeListener
* improve generation of extension string

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-12-05 13:16:16 +11:00
Simone Bordet
3417e1defe Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-12-04 15:33:58 +01:00
Simone Bordet
45fcd80182
Merge pull request #4393 from eclipse/jetty-9.4.x-4392-handle_quiet_exception_in_asyncError
Fixes #4392 - Suppress logging of QuietException in HttpChannelState.…
2019-12-04 15:33:04 +01:00
Simone Bordet
433928a016 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-12-04 15:16:38 +01:00
Simone Bordet
b82dc247e5
Merge pull request #4394 from eclipse/jetty-9.4.x-4366-socks_hostname_verification
Fixes #4366 - HTTP client uses SOCKS4 proxy hostname for SSL hostname…
2019-12-04 15:11:25 +01:00
Greg Wilkins
b3ea7d9f60 re-fixed bad merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-04 16:43:37 +11:00
Greg Wilkins
c6633e8d67 fixed bad merge
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-04 15:32:28 +11:00
Simone Bordet
2ef02da1bd Fixes #4366 - HTTP client uses SOCKS4 proxy hostname for SSL hostname verification.
Now setting correctly the host and port to the server destination
_after_ the SOCKS tunnel is established, similarly to what is done
for the HTTP CONNECT tunnel.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-03 21:40:55 +01:00
Joakim Erdfelt
806953f1b5
Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-03 10:08:15 -06:00
Joakim Erdfelt
a5e31dce20
Merge pull request #4386 from eclipse/jetty-9.4.x-4385-sslcontextfactory-sni-noexception
Issue #4385 - Limit new UnsupportedOperationException to direct SslContextFactory usage
2019-12-03 10:05:56 -06:00
Simone Bordet
839846d9a6 Fixes #4392 - Suppress logging of QuietException in HttpChannelState.asyncError().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-03 13:01:28 +01:00
Simone Bordet
9628ea3bc1 Fixes #3512 - File descriptor is not released after zip file uploaded via jetty-client.
In case of multiple parts only the last iterator was closed.
Now, every part's iterator is closed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-03 11:36:53 +01:00
Greg Wilkins
5545e906f0 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-03 12:52:29 +11:00
Jan Bartel
db9ad2fcec
Issue #4323 Ensure QoSFilter handles IllegalStateException (#4372)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-03 12:16:24 +11:00
Jan Bartel
f99eb29195
Issue #4369 Update jsp documenation; remove old config from webdefault.xml (#4384)
* Issue #4369 Update jsp documenation; remove old config from webdefault.xml

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-03 12:15:02 +11:00
Joakim Erdfelt
d1376c71eb
Issue #4385 - Correcting exception variable name.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 16:02:18 -06:00
Joakim Erdfelt
65738e770f
Issue #4385 - Fixing client testcase assertion
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 16:00:37 -06:00