Commit Graph

22343 Commits

Author SHA1 Message Date
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
Joakim Erdfelt 126dc10190
Correct META-INF/LICENSE handling
The uber-jar now uses META-INF/LICENSE from the maven build, not the dependencies.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-25 16:33:44 -06:00
gregw 7646a24828 Accidentally committed 2020-11-25 23:02:26 +01:00
Joakim Erdfelt 08ab80a3ad
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-25 15:58:16 -06:00
Joakim Erdfelt fe0a4f624e
Merge remote-tracking branch 'origin/release-9.4.35' into jetty-9.4.x 2020-11-25 15:56:09 -06:00
Joakim Erdfelt 021fd360e2
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-25 15:32:39 -06:00
Joakim Erdfelt db41fd8811
Removing -T3 and increasing timeout
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-25 15:29:29 -06:00
Joakim Erdfelt 7da43cafba
Removing dependabot.yml temporarily
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-25 15:22:48 -06:00
Simone Bordet 5d83f6670a Fixes #3080 - Do not create and use jars with "tests" classifier.
Removed the jetty-server and jetty-servlet test-jar artifacts.
The only one left is the jetty-maven-plugin test-jar.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-25 19:16:50 +01:00
dejpec 22c6b8fced
Access to cookie config with accessor method (#5526)
With this minimal change one can provide different cookie configs for the same SessionHandler
without coping the whole method into the inherited class.

Signed-off-by: Dejan Pecar <dejan.pecar@abacus.ch>
2020-11-25 14:24:29 +01:00
Lachlan Roberts ce11fb3e94 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-websocketProxy 2020-11-25 23:05:51 +11:00
Jan Bartel 497a908895 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-25 11:01:15 +01:00
dependabot[bot] 36d7a90930
Bump geronimo-atinject_1.0_spec from 1.1 to 1.2 (#5666)
Bumps geronimo-atinject_1.0_spec from 1.1 to 1.2.

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-25 10:58:07 +01:00
gregw 116705037e Accidentally committed 2020-11-25 10:19:07 +01:00
Simone Bordet ed9fd7cb51 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-25 09:05:32 +01:00
olivier lamy 49cbed7f70 not needed anymore as jetty-spring module has been removed
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-25 15:47:09 +10:00
Olivier Lamy dee5647ac1
Jetty 10.0.x restore javadoc:jar as part of ci build (#5688)
* add javadoc:jar as part of ci build

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* add javadoc warning parser

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-25 15:40:30 +10:00
dependabot[bot] 18cf16b167
Bump commons-codec from 1.13 to 1.15 (#5698)
Bumps [commons-codec](https://github.com/apache/commons-codec) from 1.13 to 1.15.
- [Release notes](https://github.com/apache/commons-codec/releases)
- [Changelog](https://github.com/apache/commons-codec/blob/master/RELEASE-NOTES.txt)
- [Commits](https://github.com/apache/commons-codec/compare/commons-codec-1.13...rel/commons-codec-1.15)

Signed-off-by: dependabot[bot] <support@github.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-25 15:35:56 +10:00
Lachlan Roberts 6a9acaaa9d do not block for websocket PING and PONG messages
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-25 11:48:33 +11:00
Simone Bordet 9fb9b23566
Merge pull request #5724 from eclipse/jetty-10.0.x-1923-remove_gcleakpreventer
Fixes #1923 - GCThreadLeakPreventer won't work with Java 9.
2020-11-25 00:42:21 +01:00
Chris Walker 8eab5ef101
First pass of fixing links. Resolves #5722 (#5723)
* First pass

Signed-off-by: Chris Walker <WalkerWatch@users.noreply.github.com>

* Fixing license header

Signed-off-by: Chris Walker <WalkerWatch@users.noreply.github.com>
2020-11-24 16:41:41 -06:00
Simone Bordet 96e068582b Fixes #1923 - GCThreadLeakPreventer won't work with Java 9.
GCThreadLeakPreventer has been removed, since the issue
it was trying to fix was solved in Java 9+.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-24 22:20:35 +01:00