Commit Graph

2360 Commits

Author SHA1 Message Date
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
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
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
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
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
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 0a70cba8ae Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-11-24 18:36:24 +01:00
Greg Wilkins 9f82ca0a80
Use File.list and File.walk within a try with resource (#5718)
* Use File.list and File.walk within a try with resource

The API contract of File.list and File.walk requires them to be closed after use.

* Fix from review

Left out filter

* Fix from review

Factored out deleteFile with better debug

* Fix from review

Can delete files whilst walking

* Fix from review

Restored sweepFile
fixed minor code suggestions
2020-11-24 18:12:42 +01:00
olivier lamy ba7d1b6377 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-24 09:42:14 +10:00
Olivier Lamy 429bec57a4
Issue #5644 Remove all profiles for session tests (#5703)
* remote session tests are now executed per default, new profile to exclude then no-remote-session-tests

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

* remove this no-remote-session-tests profile just use skipTests to skip that

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-24 09:38:30 +10:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Simone Bordet 8edb5cfc24 Issue #5691 - HttpInput may skip setting fill interest.
Code cleanups and logging improvements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-20 16:50:24 +01:00
Simone Bordet 7726c2ebcb Code cleanup to fix checkstyle issue.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 17:34:20 +01:00
Joakim Erdfelt 901a17d197
Issue #5605 - Adding more comments
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-19 10:24:36 -06:00
Joakim Erdfelt a6d432e9e3
Issue #5605 - Adding more comments and fixing logging
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-19 10:19:31 -06:00
Simone Bordet 88c03ac1dc Issue #5605 - java.io.IOException: unconsumed input during http request parsing.
Fixed test after merge.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 16:47:36 +01:00
Simone Bordet d4feb4f29d Removed unused code.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 16:08:31 +01:00
Simone Bordet 3a44648e46 Code cleanup.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 15:21:58 +01:00
olivier lamy 8eb9522775 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-19 21:36:37 +10:00
Joakim Erdfelt 5f6e72d2ed
Issue #5605 - Adding more gzip consume all tests
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-18 11:42:40 -06:00
gregw f37ad023a8 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: gregw <gregw@webtide.com>
2020-11-18 11:20:48 +01:00
Greg Wilkins 14f94f738d
Issue #5605 unconsumed input on sendError (#5637)
* Issue #5605 unconsumed input on sendError

Add Connection:close if content can't be consumed during a sendError. Processed after the request has returned to the container.

Signed-off-by: Greg Wilkins <gregw@webtide.com>

* Update from review

 + Add close on all uncommitted requests when content cannot be consumed.

* Update from review

 + fixed comment
 + space comma

* Only consume input in COMPLETE if response is >=200 (ie not an upgrade or similar)

* Updated to be less adventurous

I do not think it was valid to always consumeAll in COMPLETE as this could break upgrades with both 101s and 200s
Instead I have reverted to having this consumeAll logic only:
 + in sendError once control has passed back to the container and we are about to generate an error page.
 + in front of all the sendRedirection that we do without calling the application first.

Extra tests also added

* Updated to be less adventurous

reverted test

* Testcase for odd sendError(400) issue.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Fix for odd sendError(400) issue.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>

* Testcase for odd sendError(400) issue.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Always try to consumeAll on all requests

* Refinements after testing in 10

* Refinements after testing in 10

Fixed test

* Fixed comment from review

* Updates from review

+ added redirect methods that consumeAll
+ ensureContentConsumedOrConnectionClose renamed to ensureConsumeAllOrNotPersistent
+ ensureConsumeAllOrNotPersistent now handles HTTP/1.0 and HTTP/1.1 differently

* better consumeAll implementation

* update from review

 + better javadoc
 + filter out keep-alive
 + added more tests

* update from review

 + better javadoc

* update from review

 + fixed form redirection test for http 1.0 and 1.1

* update from review

 + HttpGenerator removes keep-alive if close present
 + Use isRedirection

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-18 10:40:05 +01:00
Joakim Erdfelt e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-17 09:12:50 -06:00
Joakim Erdfelt 1448444c65
Merge pull request #5560 from eclipse/jetty-9.4.x-5539-statisticsservlet-output
Issue #5539 - Proper StatisticsServlet output format via content negotiation
2020-11-17 08:52:34 -06:00
Jan Bartel ac6444f6ff
Issue #5272 Clean up LoginServices and LoginModules (#5641)
* Issue #5272 Clean up LoginServices and LoginModules

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-11-17 15:40:12 +01:00
olivier lamy 8dd980d256 Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-17 16:32:07 +10:00
Olivier Lamy 48b89f9394
use @Testcontainers to disable test if docker not available (#5678)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:20:16 +10:00
olivier lamy 35ace7787b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-17 12:02:31 +10:00
Olivier Lamy 213ac63d2c
Enable gcloud testing in docker (#5651)
* Enable "gcloud" profile for gcloud session testing.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* use docker image as google datastore

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

* fix project id

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

* all tests pass here

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

* do not trim stack trace

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

* Try distinguishing between localhost and non-localhost

Signed-off-by: Jan Bartel <janb@webtide.com>

* add some debug

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

* remove non needed pom content

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

Co-authored-by: Jan Bartel <janb@webtide.com>
2020-11-17 11:13:22 +10:00
Joakim Erdfelt 314c65fb14
Issue #5539 - Adding StatisticsServlet tests in test-distribution
+ Updating module definition for JSON

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 12:31:28 -06:00
Joakim Erdfelt d3f275ad4b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-16 09:58:46 -06:00
Joakim Erdfelt 7f86f5e9ad
Merge pull request #5663 from eclipse/dependabot/maven/jetty-9.4.x/openwebbeans.version-2.0.20
Bump openwebbeans.version from 2.0.19 to 2.0.20
2020-11-16 09:58:24 -06:00
Simone Bordet 36d8289dee Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-16 16:39:53 +01:00
dependabot[bot] 991e23d80b
Bump openwebbeans.version from 2.0.19 to 2.0.20
Bumps `openwebbeans.version` from 2.0.19 to 2.0.20.

Updates `openwebbeans-web` from 2.0.19 to 2.0.20
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits/openwebbeans-2.0.20)

Updates `openwebbeans-jetty9` from 2.0.19 to 2.0.20
- [Release notes](https://github.com/apache/openwebbeans/releases)
- [Commits](https://github.com/apache/openwebbeans/commits/openwebbeans-2.0.20)

Signed-off-by: dependabot[bot] <support@github.com>
2020-11-16 14:05:10 +00:00
Lachlan Roberts 8ff545f696 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-5320-WebSocketHttpClient2 2020-11-12 09:42:48 +11:00
Simone Bordet a308881fab Fixes #5633 - Allow to configure HttpClient request authority.
Introduced HttpDestination.send(Request, Response.CompleteListener) to send a request using the given destination.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-11 17:13:00 +01:00
Lachlan 23f75a395b
Merge pull request #5599 from eclipse/jetty-9.4.x-XML-Review
Fixes to XML formatting and comments.
2020-11-11 13:55:26 +11:00
Joakim Erdfelt 9e22260377
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-10 12:12:39 -06:00
Joakim Erdfelt 21c27f6370
Fixing checkstyle violations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-10 06:33:04 -06:00
dependabot[bot] 949a89c15b
Bump geronimo-interceptor_1.2_spec from 1.1 to 1.2 (#5632)
Bumps geronimo-interceptor_1.2_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-10 16:34:46 +10:00
dependabot[bot] deef0b4e30
Bump geronimo-jcdi_2.0_spec from 1.1 to 1.3 (#5607)
Bumps geronimo-jcdi_2.0_spec from 1.1 to 1.3.

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-10 14:26:52 +10:00
Lachlan Roberts bd553d98e5 fixing badly formatted XML comments
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:51:35 +11:00
Lachlan Roberts 4c172b5bbb Fix xml <Ref/> tags using id instead of refid.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-09 23:30:36 +11:00