42ea202858
Merge pull request #5047 from eclipse/jetty-9.4.x-moduleCommentDoNotEdit
...
the "DO NOT EDIT" comment in .mod files should start with '#'
2020-07-16 08:43:00 +10:00
860cba7877
Use Consumer<NativeWebSocketConfiguration> in ConnectFutureTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-16 07:45:16 +10:00
7c44d0a01a
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-15 23:38:04 +02:00
5c1dda3f7c
Issue #5029 Relative Redirection ( #5038 )
...
* Issue #5029 Relative Redirection
Provide option to allow relative redirection
* Issue #5029 Relative Redirection
Fixed checkstyle
* rename from review
2020-07-15 23:14:26 +02:00
b08fd185c8
Issue #5025 - wrong welcome file handling with dispatcher.include() and non-default mapping ( #5026 )
...
Signed-off-by: Grzegorz Grzybek <gr.grzybek@gmail.com>
2020-07-15 14:29:33 +02:00
8cc380ed9e
Fix ServletHandlerTest.testFiltersServletsListenersAsBeans
...
In jetty-10, the Container.Listener is also dumped as a bean, whereas it is not in
jetty-9. The test was checking that nothing was dumped as a bean, so
changed the test to explicitly look for the special formatting for
listeners, filters and servlets.
2020-07-15 11:26:58 +02:00
f9750c9632
Test aborting with exception before WS upgrade completes.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 19:21:01 +10:00
0f7d99c3bf
add documentation for ssl-reload, change exception message in SslContextFactory
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 19:01:15 +10:00
eb1e0b6d51
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-15 10:52:57 +02:00
6b57654b03
Avoid large allocations of temporary buffers in BuferUtil ( #5045 )
...
* Avoid large allocations of tmp buffers in buferutil
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
* review feedback
Signed-off-by: Sergey Tselovalnikov <sergeicelov@gmail.com>
2020-07-15 10:07:27 +02:00
de1b6745c5
the DO NOT EDIT comment in .mod files should start with '#'
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 16:47:22 +10:00
037097211c
fix cast for HttpServletMapping
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 16:03:12 +10:00
c40ba69222
add null checks in SslContextFactory for _factory, which could be null if reload failed
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-15 15:35:22 +10:00
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
Lachlan
gregw
Grzegorz Grzybek
Jan Bartel
Sergey Tselovalnikov
Simone Bordet
olivier lamy