Eclipse/jetty.project
1
0
Fork 0
mirror of https://github.com/jetty/jetty.project.git synced 2025-03-03 20:39:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
22,453 Commits 61 Branches 466 Tags
Commit Graph

22453 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joakim Erdfelt
41c2e9cb6d
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5739-Remove-distribution-from-doco 2020-12-02 14:52:53 -06:00
Simone Bordet
0eccddecec
Merge pull request #5744 from eclipse/jetty-10.0.x-5086-review-scanner 
Issue #5086 Review and rework o.e.j.util.Scanner
 2020-12-02 19:25:37 +01:00
Simone Bordet
9c882ee796 Improved KeyStoreScanner.scan(). 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 19:24:19 +01:00
Jan Bartel
37882236a6 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-12-02 18:35:49 +01:00
Jan Bartel
f0a2ab4fed
Issue #5675 Update some osgi test dependencies (#5676) 
* Issue #5675 Update some osgi test dependencies

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-02 18:21:18 +01:00
Joakim Erdfelt
c90690abf6
Updating example output 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-02 10:54:30 -06:00
Joakim Erdfelt
ddef266fe7
Fixing comment 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-12-02 10:54:13 -06:00
Simone Bordet
fe0e076055 Using capital case for static final field. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 17:47:56 +01:00
Simone Bordet
97b3f262ab Fixed scan(Callback) bug, returning early in case of failures. 
More cleanups in code adding more privateness, getting rid of unnecessary exceptions, making fields final, etc.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-12-02 12:53:23 +01:00
Jan Bartel
8fe8cb8c27 Issue #5086 Add blocking method for immediate scan. 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-02 10:27:08 +01:00
gregw
f00a2c2917 WIP 2020-12-02 09:33:37 +01:00
gregw
1768bd898f Fix #5739 Remove distribution from doco 
Mostly mechanical fixes
 2020-12-02 09:16:29 +01:00
Jan Bartel
c776eeb838 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5086-review-scanner 2020-12-02 09:03:46 +01:00
Jan Bartel
e39ec6cab4 Issue #5086 Fix error on addFile 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-02 08:02:09 +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
Jan Bartel
31cc298987 Issue #5086 Changes after review 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 22:05:33 +01:00
Jan Bartel
90e48ba0b5 Issue #5086 Fix javadoc 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 17:44:33 +01:00
Jan Bartel
115a72da65 Issue #5086 Fix checkstyle in test 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 17:19:46 +01:00
Jan Bartel
4304c7861c Issue #5086 Improve ScannerTest 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 15:55:45 +01: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
Jan Bartel
4883332593 Issue #5086 Review and rework o.e.j.util.Scanner 
Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-12-01 14:58:18 +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
Lachlan Roberts
8aedc50048 fix missing usage of the new _direct field in ByteBufferAccumulator 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-02 00:07:38 +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
Lachlan Roberts
6dce1cbffd Make ByteBufferAccumulator direct configurable 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-01 10:07:18 +11:00
Lachlan Roberts
602cd7e5c0 throw ArithmeticException on integer overflow from size 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-12-01 09:51:09 +11:00
Lachlan Roberts
a51b5db209 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-01 09:45:45 +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