80f1afb0fd
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
2020-07-09 16:19:41 +02: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
a5a2ae6f45
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
2020-07-09 13:32:47 +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
06737ce800
skip jetty-11.0.0.beta0
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-09 20:48:34 +10:00
9fa6a5794c
Updating to version 11.0.0-SNAPSHOT
2020-07-09 16:24:52 +10:00
5353ec98e0
Updating to version 11.0.0.beta0
2020-07-09 14:32:48 +10:00
578768da21
add jetty-11.0.0-SNAPSHOT
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-09 14:26:01 +10: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
b85c5215a5
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-07-09 07:55:34 +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
f1be8cc72d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-08 16:35:16 +02:00
f4f85fed44
Fix TestJettyOSGiAnnotationParser.
2020-07-08 16:33:14 +02:00
7b7e20a264
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-08 17:37:03 +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
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
872b2741be
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-07 14:32:57 +02: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
fb4f8ece54
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-07 18:19:38 +10: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
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
ba6a6ea67d
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-06 23:10:19 +02:00
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
3eb031b2b9
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-06 17:30:14 +02:00
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
4ab5a6044f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-06 10:43:01 +02:00
bd15434915
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-07-06 10:37:32 +02:00
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
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
a5005c1e1c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-07-06 12:55:00 +10:00
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
5e1dd78379
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-06 12:42:20 +10:00
fbe3803cd1
fix checkstyle issue
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-06 12:19:38 +10:00
345440139b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-06 12:18:58 +10:00
9a56301de1
Merge pull request #5004 from eclipse/jetty-9.4.x-4985-AttributeNameSet
...
Issue #4985 - fix NPE related to use of Attributes.Wrapper getAttributeNameSet()
2020-07-06 11:34:27 +10:00
6a8a6efd1c
Issue #5018 - add request timeout onto ClientUpgradeRequest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-04 11:37:45 +10:00
7d8e56bd10
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-03 16:46:23 +02:00
ae43b70a9f
Jetty 9.4.x 4967 buffer corruption for http2 failures ( #5001 )
...
Fixes #4967 - Possible buffer corruption in HTTP/2 session failures
Partially reverted the changes introduced in #4855 , because they
were working only when sends were synchronous.
Introduced ByteBufferPool.remove(ByteBuffer) to fix the issue.
Now when a concurrent failure happens while frames are being
generated or sent, the buffer is discarded instead of being
recycled, therefore resolving the buffer corruption.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-03 16:35:33 +02:00
f036fe649e
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-07-03 21:00:09 +10:00
42d5db3208
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-07-03 10:46:24 +02:00
b033d6078f
Issue #5012 - Remove unneeded dependency for test-jaas-webapp
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-03 09:54:18 +02:00
Simone Bordet
olivier lamy
Jan Bartel
Lachlan Roberts