Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
22,334 Commits 65 Branches 460 Tags 355 MiB
Commit Graph

22334 Commits

Author SHA1 Message Date
gregw e94c685675 Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-11-18 11:21:30 +01: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
Jan Bartel a70ecb51a1 Remove addition of jetty-util-ajax to osgi deployment 
The jetty-util-ajax jar is not a dependency of jetty-servlets in
jetty-10.0.x like it is in jetty-9.4.x.

Signed-off-by: Jan Bartel <janb@webtide.com>
 2020-11-18 10:49:53 +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
Lachlan Roberts aba2c93eae Add tests for the ordering of the default WebSocketUpgradeFilter. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-18 15:10:14 +11:00
Greg Wilkins 41a7d8bcb5
Fixes #5679 and #5680 listing modules (#5683) 
+ Updated usage to show that --list-config lists the enabled Modules
+ fixed unsupported operation in --list-all-modules
+ list enabled modules with default --list-module
 2020-11-17 23:03:57 +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
Simone Bordet a3a153d08d Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-11-17 13:41:45 +01:00
Simone Bordet 1d71cabef4 Fixed test that was failing due to TLS 1.3 backport to Java 8. 
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
 2020-11-17 13:39:28 +01:00
Greg Wilkins 71087e53a6
Minor cleanup SecureRequestCustomizer (#5660) 
* For #5650 protect from bad SslSession

Better protection from a bad SslSession like seen in #5650

* review indicated that there is too much depth to defend.  So just a little cleanup in this PR.
 2020-11-17 13:21:03 +01:00
Lachlan Roberts f52e61156d add test for a subclassed WebSocketUpgradeFilter 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-17 20:57:21 +11:00
olivier lamy 19b4ffe14b Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-11-17 16:35:01 +10:00
olivier lamy 3c4e259dc2 fail quickly 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-17 16:33:39 +10: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 2c94cf0cd2 fix javadoc 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-17 16:18:04 +10:00
olivier lamy 0a9bbcbaff fix Jenkinsfile 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-17 14:20:49 +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
Joakim Erdfelt 683d9a9349
Issue #5539 - Updating StatisticsServlet accept processing per review 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:24 -06:00
Joakim Erdfelt 770be2dbc3
Issue #5539 - Adding jetty-util-ajax missing dep to osgi tests 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:23 -06:00
Joakim Erdfelt fd974c474c
Fixing bad Container Include Jar pattern. 
+ It was matching on jetty-util-ajax-#.jar as well.

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:23 -06:00
Joakim Erdfelt c9440357a7
Issue #5539 - Fixing javadoc 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:23 -06:00
Joakim Erdfelt c511275580
Provide more detail in test failure on CI 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:22 -06:00
Joakim Erdfelt cc952f3a3a
Issue #5539 - Adding query parameter accept variation 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:22 -06:00
Joakim Erdfelt b419db90c5
Issue #5539 - Cleanup, adding javadoc, etc. 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:21 -06:00
Joakim Erdfelt 02f35deeaa
Issue #5539 - Deprecating 'xml' request parameter in StatisticsServlet 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:21 -06:00
Joakim Erdfelt 5362467e67
Issue #5539 - Proper StatisticsServlet output format via content negotiation 
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2020-11-16 09:10:21 -06:00
Simone Bordet 3cbd117ec9
Merge pull request #5640 from eclipse/jetty-9.4.x-5633-httpclient_configure_authority 
Fixes #5633 - Allow to configure HttpClient request authority.
 2020-11-16 15:41:42 +01:00
Joakim Erdfelt 1daac1adbc
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-11-16 08:28:09 -06:00
Joakim Erdfelt 205676fd99
Merge pull request #5572 from eclipse/jetty-9.4.x-compact3-clean 
Correcting compact3 jar contents to only include org.eclipse.jetty
 2020-11-16 08:27:40 -06: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
gregw 3508fdc955 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 
Signed-off-by: gregw <gregw@webtide.com>
 2020-11-16 11:56:13 +01:00
Greg Wilkins 850a0330ff
Cleanup request/response recycle #4711 (#5643) 
* Cleanup request/response recycle #4711

Reordered recycle in request and response to field order so that we can check that all fields are recycled.

* Fixed ordering of reader consumption

* update from review
 2020-11-16 11:48:33 +01:00
Lachlan b2bd86701c
Merge pull request #5638 from eclipse/jetty-10.0.x-AutobahnDocker 
Run websocket autobahn-testsuite with docker in junit test
 2020-11-16 16:10:24 +11:00
Lachlan Roberts 3b22c6bc66 fix broken test: AltFilterTest 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-16 15:57:28 +11:00
olivier lamy a5cf5c0e86 restore -Dmaven.test.failure.ignore=true 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-14 18:53:31 +10:00
olivier lamy 041b5c8712 keep -fae 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-14 15:44:46 +10:00
olivier lamy 48c8db6316 pool scm daily 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-14 14:17:13 +10:00
olivier lamy 8a1130bc41 simpify autobahn build 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-14 14:15:39 +10:00
olivier lamy 9786bc4c98 add Jenkinsfile for autobahn build 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-14 14:10:44 +10:00
olivier lamy 3e09b86903 should exclude autobahn test per default 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2020-11-14 13:04:19 +10:00
Lachlan Roberts 6dad0b1b7e rename WebSocketMapping to WebSocketMappings 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-14 10:46:09 +11:00
Lachlan Roberts 165beff3f3 add test for multiple WebSocketUpgradeFilters 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2020-11-14 10:43:14 +11:00