2541f1f648
add javadoc for KeyStoreScanner class
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 11:20:57 +10:00
fb4cfa9be6
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-14 15:01:37 +02:00
6d88f966e1
Issue #4736 Use variables for osgi import ranges ( #4963 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-14 14:22:38 +02:00
3b9def69bc
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-14 14:11:15 +02:00
25a7da2635
add test for abort with CompletableFuture.completeExceptionally()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 21:47:31 +10:00
664cf5fb52
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-5018-WebSocketClientConnectFuture
2020-07-14 21:21:08 +10:00
b1e08ba4e0
Issue #5020 Make servlets,filters,listeners beans again ( #5028 )
...
* Issue #5020 Make servlets,filters,listeners beans again
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-14 11:20:20 +02:00
9c910e9413
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 18:09:40 +10:00
145dcf502c
cleanups after merge
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 16:52:50 +10:00
df34a6269b
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5018-WebSocketClientRequestTimeout
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 16:39:23 +10:00
a83844df32
changes from review
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 16:10:07 +10:00
7b05567b52
Issue #4808 - Review HttpClient Request header APIs.
...
For some reason, Request.getHeaders() returned HttpFields,
but HttpRequest.getHeaders() returned HttpFields.Mutable,
and it was obviously wrong.
Fixed WebSocket code that was relying on this API error.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-13 16:44:07 +02:00
b03643961d
add tests in KeystoreScannerTest for changes with symlinks
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-14 00:22:21 +10:00
62ee077b79
move code of ssl-reload module to jetty-util, move module files to jetty-server
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 23:11:09 +10:00
e92d35bd2c
fix checkstyle error from extra newline
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 15:56:46 +10:00
fc0f4b28f9
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 15:06:09 +10:00
ca404f157f
clean up and rename fields in EventSocket WebSocket test utility class
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 14:53:55 +10:00
6325d4b55c
Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 14:17:37 +10:00
0705d8ea77
generalize the exception type tested in KeystoreReloadTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 13:35:47 +10:00
dc91f690be
use WorkDirExtension in KeystoreReloadTest to fix failing tests on jenkins
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-13 11:33:51 +10:00
80f09e1f71
fix issues with the ssl-reload module
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-10 18:44:44 +10:00
f34873419e
Issue #5019 - add jetty module files and xml to use ssl-reload with start.jar
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-10 18:44:35 +10:00
13e034fc5f
Issue #5019 - add testing for the SslKeyStoreScanner
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-10 18:44:24 +10:00
24d0e50a0c
Issue #5019 - add class to do SSL keystore hot-reload in new module
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-10 18:44:08 +10:00
3ddccfe4bc
support gh token for github api
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:12:03 +10:00
eefe3d202b
revert fail release
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
9619a5a743
Updating to version 10.0.0.beta1
2020-07-10 14:23:28 +10:00
822c1a6e0e
fix VERSION.txt
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 06:49:46 +10:00
113595254b
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-09 16:19:24 +02:00
94956d6e8b
Issue #4904 - WebsocketClient creates more connections than needed.
...
Fixed MaxConcurrentStreamsTest - it was always broken.
The problem was that the call to super.onSettings(...) was done
_after_ sending the request, so the connection pool was still
configured with the default maxMultiplex=1024.
Also fixed AbstractConnectionPool to avoid a second call to
activate() if we are not trying to create a new connection.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-09 16:18:15 +02:00
d31bbb2195
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-09 13:30:15 +02:00
6844c9362d
Issue #4904 - WebsocketClient creates more connections than needed.
...
Fixed MultiplexConnectionPool.acquire() to use the new boolean
parameter to decide whether or not create a new connection.
This fixes ConnectionPoolTest instability.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-09 13:27:44 +02:00
aaeffb719e
Updating to version 10.0.0-SNAPSHOT
2020-07-09 12:25:34 +10:00
23c99ffdbe
Updating to version 10.0.0.beta1
2020-07-09 11:20:55 +10:00
25d7b99ba1
Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-09 08:11:05 +10:00
4cd6a71134
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-07-09 07:54:59 +10:00
7bcbc21ca9
no need of system property for this
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-09 07:52:47 +10:00
f4f85fed44
Fix TestJettyOSGiAnnotationParser.
2020-07-08 16:33:14 +02:00
a179535db3
Issue #5018 - add WebSocketClient UpgradeRequest timeout to jetty 10
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-08 18:04:36 +10:00
c716edd7a2
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-08 17:35:13 +10:00
6c161ca5c0
Fix checkstyle violation.
2020-07-08 09:04:53 +02:00
d7c47f42d6
Issue #5018 - add testing for WebSocketClient Future cancellations
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-08 16:48:43 +10:00
794d67c4d6
Merge pull request #5024 from eclipse/jetty-9.4.x-5018-ClientUpgradeRequestTimeout
...
Issue #5018 - add request timeout onto ClientUpgradeRequest
2020-07-08 16:36:07 +10:00
13297d5bd7
Issue #5018 - cancellation of WebSocketClient.connect Future should fail upgrade
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-08 16:20:27 +10:00
73919e10e2
Fix headers on new files coming from jetty-9.4
2020-07-07 14:19:53 +02:00
7ca67f9948
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-07 14:13:11 +02:00
0808b5c0fc
Issue #4989 Prevent parsing of module-info.class in osgi bundles ( #4991 )
...
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-07-07 14:07:19 +02:00
702a48c2d1
Issue #5018 - rename ClientUpgradeRequest timeout to setTimeout
...
and increase timeouts used for testing
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-07 22:05:01 +10:00
fb07bdf159
Issue #4967 - Possible buffer corruption in HTTP/2 session failures.
...
Fixed test failure after merge.
Made sure the lastStreamId is updated when resetting a new
stream since it has been seen by the server and handled.
This avoids that a new stream arriving during shutdown is
interpreted as a connection failure, therefore failing all
pending streams - we want them to complete.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-07 11:42:16 +02:00
effcccd27a
Merge pull request #4980 from eclipse/jetty-9.4.x-threadPoolDocumentation
...
fix documentation on where to configure ThreadPool
2020-07-07 18:18:48 +10:00
Lachlan Roberts
Jan Bartel
Simone Bordet
olivier lamy