21371 Commits

Author SHA1 Message Date
Joakim Erdfelt
c0dc907a30
Merge pull request #4997 from eclipse/jetty-10.0.x-4572-message-indent
Issue #4572 - Implementing old logging TAG_PAD as Message Alignment.
2020-08-20 14:14:30 -05:00
Joakim Erdfelt
47229e0190
Addressing checkstyle error
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-20 13:31:17 -05:00
Joakim Erdfelt
5a0f18513b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-4572-message-indent 2020-08-20 13:29:50 -05:00
olivier lamy
a196f9636a no need to this in the pom for a jar
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-20 19:33:44 +08:00
Lachlan Roberts
12381e9cf5 cleanup various warnings and TODOs in CustomRequestLog
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 12:02:00 +10:00
Lachlan Roberts
0fae221afa Issue #5105 - fix GracefulStopTest expectations from 503s to 404s
StatisticsHandler no longer gives 503 responses after shutdown.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 07:27:12 +10:00
Lachlan Roberts
a65f00156d Issue #5105 - add optional configuration to not wait for suspended requests in StatisticsHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 07:27:12 +10:00
Lachlan Roberts
32358b1b77 Issue #5105 - fix StatisticsHandler bug with async dispatched requests
If the request is async dispatched, the check state.isSuspended() is not
correct to determine if the request was async or not. The check
state.isAsyncStarted() should be used instead.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-20 07:27:12 +10:00
Thomas Draebing
a46ed5b5f0 Also manage graceful shutdown of already started async requests
Signed-off-by: Thomas Draebing <thomas.draebing@sap.com>
2020-08-19 09:59:21 +02:00
Lachlan Roberts
35f3f1886e Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-19 09:39:31 +10:00
Lachlan Roberts
37a8e44347 fix WebSocketStatsTest numMessages back to 1000
Remove server getConnections check after client open event
as the server connection may not be open yet.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-19 09:36:56 +10:00
Lachlan Roberts
7d6f692721 disable autoFragment for WebSocketStatsTest
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-19 09:32:54 +10:00
Lachlan Roberts
931e10458a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-19 08:34:39 +10:00
Lachlan
cfd31b2cf5
Merge pull request #5125 from eclipse/jetty-9.4.x-5122-WebSocketStats
Issue #5122 - Improve connection statistics for WebSocket
2020-08-19 08:04:47 +10:00
Simone Bordet
158a57276e Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-18 12:22:44 +02:00
Simone Bordet
c88aba6587 Fixes #5152 - HttpClient should handle unsolicited responses.
Now closing the connection if an unsolicited response is detected,
no matter what response status code, or whether it has a
Connection: close header, or whether it's just random bytes from
the server, and also no matter whether the client read -1.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-18 12:18:20 +02:00
Simone Bordet
0646e4d0b5 Fixes #5165 - Wrong messagesIn count for HttpClient.
Now incrementing inMessages only when the response is complete.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-18 11:41:18 +02:00
olivier lamy
babf8f3d1e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-08-18 14:08:57 +08:00
olivier lamy
ff3ebeff54 add dependabot for 9.4.x branch
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-18 14:08:28 +08:00
olivier lamy
084db1916b let do this weekly only
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-18 14:07:05 +08:00
Lachlan Roberts
c37d902ef7 remove tri-state logic from IncludeExcludeConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-18 10:18:44 +10:00
Lachlan
471a06dc37
Merge pull request #5154 from eclipse/jetty-10.0.x-SurefireUpdateWebSocketFailure
Fix WebSocketServerExamplesTest to work after maven surefire update
2020-08-17 09:45:52 +10:00
sullis
74a16382ab
enable Dependabot v2 (#5077)
Signed-off-by: Sean C. Sullivan <github@seansullivan.com>
2020-08-15 11:17:24 +10:00
olivier lamy
3998d87d0f Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-08-15 09:13:28 +08:00
Olivier Lamy
2d9fcf20ea
upgrade some maven plugins version (#5143)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-15 10:32:01 +10:00
Simone Bordet
7bc52f924a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-14 18:34:46 +02:00
Simone Bordet
a6e1f9df8f
Merge pull request #5151 from olegmoz/5150-zero-connection-timeout
Issue #5150 - Infinite connection timeout support in ManagedSelector
2020-08-14 18:32:52 +02:00
Lachlan Roberts
1663a6d7af Issue #5125 - Generalise WebSocketConnectionStatistics into IncludeExcludeConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-14 15:19:06 +10:00
Oleg Mozzhechkov
32fe19a5e0 #5150 - Code style fix and connect timeout docs update
Signed-off-by: Oleg Mozzhechkov <oleg.mozzhechkov@gmail.com>
2020-08-13 21:23:31 +03:00
Simone Bordet
e5570639e3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 19:40:34 +02:00
Simone Bordet
edbc1930b9 Issue #4809 - Set a max number of requests per connection.
Added test case for idle connections not used for any request.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 19:39:27 +02:00
Simone Bordet
45682c2088 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 18:31:34 +02:00
Simone Bordet
51d0780041 Issue #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2.
Fixed HttpFields.computeField() removal loop.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 18:23:26 +02:00
Simone Bordet
ac4ea4550e Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 16:52:35 +02:00
Simone Bordet
26c2d34439 Issue #4809 - Set a max number of requests per connection.
Improved Pool.reserve(int) logic to take into account the
fact that an entry can accommodate maxMultiplex acquires.

This reduces connection openings for HTTP/2 in case of
spikes of requests.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 16:52:06 +02:00
Oleg Mozzhechkov
bffd6a2c0f #5150 - Infinite connection timeout support in ManagedSelector
Signed-off-by: Oleg Mozzhechkov <oleg.mozzhechkov@gmail.com>
2020-08-13 17:36:16 +03:00
Joakim Erdfelt
e7a07074f5
Setting DemoBaseTest.testAsyncRest() as @Tag("external")
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-13 08:42:44 -05:00
Simone Bordet
46220a0f58 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-13 15:05:23 +02:00
Simone Bordet
1b3cb2ea8d
Merge pull request #5144 from eclipse/jetty-9.4.x-5104-incorrect_via_header
Jetty 9.4.x 5104 incorrect via header
2020-08-13 14:22:18 +02:00
Lachlan Roberts
de1077c375 Fix WebSocketServerExamplesTest to work with surefire update
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-13 22:04:56 +10:00
Simone Bordet
7b3dccc1bf Issue #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2.
Added HttpFields.computeField() for HttpHeader too and updated usages.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 11:50:43 +02:00
Simone Bordet
c3598e814b Merged branch 'jetty-9.4.x-5104-incorrect_via_header-2' into 'jetty-9.4.x-5104-incorrect_via_header'. 2020-08-13 11:33:50 +02:00
Greg Wilkins
a933b1645c simplified loops
unmodifiable found list

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-08-13 11:27:37 +02:00
Greg Wilkins
f31604cff2 added test. Fixed bugs
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-08-13 11:17:19 +02:00
Simone Bordet
faea7c9ac1 Fixes #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2.
Fixed javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 11:05:38 +02:00
olivier lamy
320f850a4b revert to surefire M4 as jmps changes break our build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-08-13 17:02:39 +08:00
Greg Wilkins
f1a13521df improved implementation
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-08-13 10:06:31 +02:00
Simone Bordet
79d340fdb6 Fixes #5104 - AbstractProxyServlet include incorrect protocol version in Via header when accessed over H2.
* Introduced HttpFields.computeField() to put/append header values.
* Reworked AbstractProxyServlet.addViaHeader().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-08-13 00:08:52 +02:00
Joakim Erdfelt
00f4859e33
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-12 16:04:06 -05:00
Joakim Erdfelt
9b5b43a2fd
Fixing KeyStoreScannerTest
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-12 15:50:11 -05:00