Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-02-25 00:45:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
21,099 Commits 55 Branches 466 Tags
Commit Graph

21099 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Lachlan Roberts
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
Lachlan Roberts
a83844df32 changes from review 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-14 16:10:07 +10:00
Simone Bordet
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
Lachlan Roberts
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
Lachlan Roberts
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
Lachlan Roberts
e92d35bd2c fix checkstyle error from extra newline 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 15:56:46 +10:00
Lachlan Roberts
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
Lachlan Roberts
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
Lachlan Roberts
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
Lachlan Roberts
0705d8ea77 generalize the exception type tested in KeystoreReloadTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-13 13:35:47 +10:00
Lachlan Roberts
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
Lachlan Roberts
80f09e1f71 fix issues with the ssl-reload module 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:44 +10:00
Lachlan Roberts
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
Lachlan Roberts
13e034fc5f Issue #5019 - add testing for the SslKeyStoreScanner 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-10 18:44:24 +10:00
Lachlan Roberts
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
olivier lamy
3ddccfe4bc support gh token for github api 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
jetty-10.0.0.beta1 		2020-07-10 15:12:03 +10:00
olivier lamy
eefe3d202b revert fail release 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 15:04:22 +10:00
olivier lamy
9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy
822c1a6e0e fix VERSION.txt 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-07-10 06:49:46 +10:00
Simone Bordet
113595254b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-09 16:19:24 +02:00
Simone Bordet
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
Simone Bordet
d31bbb2195 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-09 13:30:15 +02:00
Simone Bordet
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
olivier lamy
aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy
23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Lachlan Roberts
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
olivier lamy
4cd6a71134 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-07-09 07:54:59 +10:00
olivier lamy
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
Jan Bartel
f4f85fed44 Fix TestJettyOSGiAnnotationParser. 2020-07-08 16:33:14 +02:00
Lachlan Roberts
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
Lachlan Roberts
c716edd7a2 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-08 17:35:13 +10:00
Jan Bartel
6c161ca5c0 Fix checkstyle violation. 2020-07-08 09:04:53 +02:00
Lachlan Roberts
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
Lachlan
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
Lachlan Roberts
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
Jan Bartel
73919e10e2 Fix headers on new files coming from jetty-9.4 2020-07-07 14:19:53 +02:00
Jan Bartel
7ca67f9948 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-07 14:13:11 +02:00
Jan Bartel
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
Lachlan Roberts
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
Simone Bordet
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
Lachlan
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
74916c2fc9 Issue #5018 - add test case for ClientUpgradeRequest timeout 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-07 16:38:51 +10:00
Simone Bordet
ba6a6ea67d Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-06 23:10:19 +02:00
Simone Bordet
f2c6b67827
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo(). (#5008) 
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo().

Now the upgrade-from connection produces a "floating" buffer 
(not belonging to a pool), so that it can release the original buffer.

The upgrade-to connection is free to copy or store this "floating" buffer.

Strengthened ByteBufferPool behavior when releasing non-pooled
ByteBuffers: the buffer is now discarded.

Updated javadocs and all implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-06 22:45:03 +02:00
Simone Bordet
3eb031b2b9 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-06 17:30:14 +02:00
Simone Bordet
43353d0ca9 Issue #4890 - JettyClient behavior when SETTINGS_HEADER_TABLE_SIZE is set to 0 in SETTINGS Frame. 
Fixed NPE in debug logs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-07-06 17:29:07 +02:00
Jan Bartel
bd15434915 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-07-06 10:37:32 +02:00
Jan Bartel
d785b590b1
Issue #5000 Fix NPE in FilterMapping.appliesTo (#5005) 
* Issue #5000 Fix NPE in FilterMapping.appliesTo

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-07-06 10:24:10 +02:00
Lachlan Roberts
085a6112c5 Issue #4985 - revert changes from 9.4 merge to Include, Forward and Async Attributes 
The proper ServletPathMapping is not set on the baseRequest when these are constructed
so we can't save fields from this in the constructor. The ServletPathMapping is
later set in the ServletHandler.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-07-06 16:11:56 +10:00
Lachlan
33852f5137
Merge pull request #4912 from eclipse/jetty-10.0.x-4907-suspendAfterCloseRace 
Issue #4907 - close websocket suspendState if close frame is received
 2020-07-06 12:54:39 +10:00