gregw
1768bd898f
Fix #5739 Remove distribution from doco
...
Mostly mechanical fixes
2020-12-02 09:16:29 +01:00
Lachlan
121d898517
Move websocket-util classes into websocket-core ( #5705 )
...
- Merge websocket-util classes into websocket-core
- rename websocket-util-server to websocket-servlet
- remove websocket-util
* merge websocket-util into websocket-core-common
* move websocket-util-server implementation to websocket-core-server
* rename websocket-util-server to websocket-servlet
* Negotiator should not need the WebSocketComponents, give this to handshaker instead
* fix tests and WebSocketConfigurations
* move exception classes in websocket-core-common
* move MessageSinks and util to internal package
* create internal package for websocket-core-client
* fix JPMS warnings for websocket common modules
* Fixed exports declarations to make MethodHandles.publicLookup() working properly.
* fix broken tests with wrong WebSocketUpgradeFilter package name
* remove -T3 option to not have parallel build
* no need of jacoco here
* do no reuse forks
* remove logback dependency and disable debug log level
* make this test dynamic instead of hardcoded version...
* use -fae
* change websocket-servlet bundle symbolic name
* cleanup changes
* restore bugs....
* Updates after review.
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-02 11:10:15 +11:00
Ludovic Orban
845c6b457a
merge jetty-9.4.x into jetty-10.0.x
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-01 15:26:25 +01:00
Ludovic Orban
a26731c5ea
merge jetty-9.4.x into jetty-10.0.x
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-01 15:25:25 +01:00
Ludovic Orban
6199c975d2
Merge pull request #5743 from eclipse/jetty-9.4.x-5741-PoolMaxUsageOverflow
...
max usage count fixes
2020-12-01 15:19:24 +01:00
Joakim Erdfelt
a4e35b87c0
Merge pull request #5730 from eclipse/jetty-10.0.x-fix-runner-manifest
...
Correct META-INF/LICENSE handling
2020-12-01 08:19:02 -06:00
Ludovic Orban
44e6f4aeb8
sweep the entries list when the max usage count is changed
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-01 15:18:06 +01:00
Lachlan Roberts
b4fc70430c
do not used fixed port in core WebSocketProxyTest
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-02 00:12:16 +11:00
Simone Bordet
38aec0b081
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 13:24:26 +01:00
Simone Bordet
51d96eced8
Removed hardcoded port.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 13:23:13 +01:00
Simone Bordet
03b2b97751
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 12:58:18 +01:00
Simone Bordet
eb00ac2dde
Restored first-close-and-remove-then-notify ordering that was changed with the changes for #5310 .
...
This is important in tests that check that streams have been removed from sessions after counting down a latch in the notification.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-12-01 12:55:23 +01:00
Ludovic Orban
0ff1bfdd5e
fix bug that messes up the max usage count when the entries' max usage counter overflows
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-01 10:02:31 +01:00
Lachlan Roberts
b26cda59d9
fix locations of some jmh benchmarks
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 15:56:23 +11:00
Ludovic Orban
1092085c8d
merge branch jetty-9.4.x into jetty-10.0.x
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-30 18:49:37 +01:00
Ludovic Orban
df3a32601a
reduce test load on jenkins
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-30 18:36:00 +01:00
gregw
1333bbc55c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-30 17:35:56 +01:00
gregw
69b3c37717
remove test rather than disable
...
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 17:35:37 +01:00
gregw
20f6dc1ace
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-30 17:33:21 +01:00
gregw
7e9b050050
disable test accidentally added for #5737
...
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 17:23:10 +01:00
gregw
4022be8091
remove anchient README
...
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 15:25:40 +01:00
Jan Bartel
7b77a532a8
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-30 14:42:18 +01:00
gregw
b4e2ad0df7
added CVE
...
Signed-off-by: gregw <gregw@webtide.com>
2020-11-30 14:23:45 +01:00
Jan Bartel
5ad130515f
Issue #5713 Remove dependency on derby ( #5728 )
...
* Issue #5713 Remove dependency on derby
Signed-off-by: Jan Bartel <janb@webtide.com>
* use the mariadb client version from the property
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-30 14:22:50 +01:00
Simone Bordet
8c465ac76d
Fixed tests and code after merge of #5310 from 9.4.x.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-27 13:53:06 +01:00
Simone Bordet
963ea59e75
Fixed NullPointerException during HTTP/1.1 -> HTTP/2 upgrades.
...
The upgrade could happen in the context of a HttpParser.parseNext()
call, which eventually upgrades the EndPoint, passing what remains in
the NetworkBuffer to the new Connection and releasing the NetworkBuffer.
The messageComplete() parser callback was still returning false even
if the response was 101, causing the HTTP/1.1 parser to continue, but
now the NetworkBuffer was null, producing the NullPointerException.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-27 13:50:09 +01:00
Simone Bordet
ce4bb35e97
Fixed failAllData() logic to return true if the stream is already remotely closed.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-27 13:45:28 +01:00
Simone Bordet
a241b9dd5e
Improved logging.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-27 13:43:09 +01:00
olivier lamy
54924213e8
make this test dynamic instead of hardcoded version...
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-27 13:26:00 +10:00
olivier lamy
c6f7e837f4
do not include test dependencies in jetty-runner jar
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-27 10:39:01 +10:00
Simone Bordet
662efb35c0
Updated jetty-servlet-api to 4.0.5 because 4.0.4 was wrongly including jakarta artifacts.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 19:53:14 +01:00
Simone Bordet
29372f3168
Issue #5168 - Jetty 10 artifact archives should have EPL 2 license in them.
...
Excluded unnecessary files from jetty-runner jar.
Moved MANIFEST.MF to proper place to it does not get copied into the jar root.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 18:51:24 +01:00
Simone Bordet
c85cef4da5
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 16:36:14 +01:00
Ludovic Orban
981e263d76
Merge pull request #5566 from lorban/tries-cleanup
...
Tries cleanup
2020-11-26 15:26:41 +01:00
Ludovic Orban
aa8bd5d820
replace Trie interface and impls usage with new *Index interfaces and Builders
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-26 14:14:16 +01:00
Ludovic Orban
df5622ecfc
Merge pull request #5732 from eclipse/jetty-10.0.x-5731-Pool-ArithmeticException
...
Fix ArithmeticException "/ by zero" in Pool.acquire()
2020-11-26 12:43:08 +01:00
Simone Bordet
68e70b47de
Merge pull request #5634 from eclipse/jetty-9.4.x-5310-http2_goaway
...
Review HTTP/2 GOAWAY handling
2020-11-26 11:29:44 +01:00
Simone Bordet
ac3d492305
Merge pull request #5729 from eclipse/jetty-10.0.x-3080-no_classifier_tests
...
Fixes #3080 - Do not create and use jars with "tests" classifier.
2020-11-26 11:22:03 +01:00
Simone Bordet
8131bb2f85
Fixes #3080 - Do not create and use jars with "tests" classifier.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 11:20:36 +01:00
Lachlan Roberts
0fdb01e397
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5731-Pool-ArithmeticException
2020-11-26 21:12:37 +11:00
Lachlan Roberts
4ec2c3eca2
fix websocket proxy for jetty10 websocket api
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 21:05:06 +11:00
Lachlan Roberts
cb626e72bc
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-26 20:49:49 +11:00
Lachlan Roberts
fb408611e2
fix bug with WebSocketProxy ping pong counting
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 20:49:02 +11:00
Simone Bordet
3ca8ef0297
Fixes #3080 - Do not create and use jars with "tests" classifier.
...
Reinstated ServletTester in src/main/java for backwards compatibility.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-26 10:48:19 +01:00
Ludovic Orban
b4483d3b2a
fix ArithmeticException "/ by zero"
...
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-11-26 08:59:44 +01:00
Lachlan Roberts
741ad918e4
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 17:20:05 +11:00
Lachlan
5941235725
Merge pull request #5726 from eclipse/jetty-9.4.x-websocketProxy
...
Implement and test a WebSocket Proxy with the 9.4 Jetty API
2020-11-26 16:55:36 +11:00
Lachlan Roberts
e4502865b7
use WebSocketClient instead of NetworkFuzzer in the primitive echo tests
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 15:37:36 +11:00
Lachlan
629e2d69a4
Merge pull request #5597 from eclipse/jetty-10.0.x-CloseStatus
...
Cleanups to WebSocket CloseStatus
2020-11-26 12:26:42 +11:00
Lachlan Roberts
104beb9824
add IdleTimeout test, use volatile sessions
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-26 11:22:24 +11:00