33f413b37a
Jetty 10.0.x surefire upgrade and no skip errors ( #5438 )
...
* fix apacheds version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* get some logs
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* more debug
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* testing surefire M5
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* already part of the classpath
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* add slf4j-simple to get logs
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* execute full build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* no need to add jmx module
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* use h2spec-reports
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* h2 spec tests are too flaky
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* debug
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* touch trigger build
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* not trim stacktrace per default and a bit more memory for test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* disable embedded jmx test
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* nit
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* no junit files for javadoc
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix dependency version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix missing dependency with surefire M5...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* remove debug
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fix some upperbound dependency
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
* fail quickly
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-18 21:26:38 +10:00
4093af1824
Issue 5310 - Review HTTP/2 GOAWAY handling.
...
Updates after review.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-18 12:03:35 +01:00
6a83a261e1
Always add the default WebSocketUpgradeFilter as the first filter.
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-18 21:27:25 +11:00
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
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
1d3e190e53
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-18 10:55:12 +01:00
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
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
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
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
d30d95c26c
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-17 09:20:25 -06:00
e9c6c942ea
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-17 09:12:50 -06:00
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
83e5b3fc04
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-17 15:49:00 +01:00
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
004745d05a
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
2020-11-17 13:42:15 +01:00
a3a153d08d
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-11-17 13:41:45 +01:00
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
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
f52e61156d
add test for a subclassed WebSocketUpgradeFilter
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 20:57:21 +11:00
542a73d516
fixed javax reference
...
Signed-off-by: gregw <gregw@webtide.com>
2020-11-17 10:49:16 +01:00
bdebd46cd2
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-11-17 16:35:32 +10:00
19b4ffe14b
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-11-17 16:35:01 +10:00
3c4e259dc2
fail quickly
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:33:39 +10:00
1f3995712c
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-11-17 16:32:49 +10:00
8dd980d256
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-11-17 16:32:07 +10:00
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
7af2290458
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-11-17 16:18:38 +10:00
2c94cf0cd2
fix javadoc
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:18:04 +10:00
a5fd4a3d18
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-11-17 14:21:33 +10:00
0a9bbcbaff
fix Jenkinsfile
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 14:20:49 +10:00
40df53f774
Merge branch 'jetty-10.0.x' into jetty-11.0.x
2020-11-17 12:03:31 +10:00
35ace7787b
Merge branch 'jetty-9.4.x' into jetty-10.0.x
2020-11-17 12:02:31 +10:00
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
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
bd7be9e2e3
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
2020-11-16 09:59:03 -06:00
d3f275ad4b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
2020-11-16 09:58:46 -06:00
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
406dec79e3
Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
2020-11-16 16:45:16 +01:00
36d8289dee
Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
2020-11-16 16:39:53 +01:00
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
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
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
c9440357a7
Issue #5539 - Fixing javadoc
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:23 -06:00
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
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
b419db90c5
Issue #5539 - Cleanup, adding javadoc, etc.
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-16 09:10:21 -06:00
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
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
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
Olivier Lamy
Simone Bordet
Lachlan Roberts
gregw
Jan Bartel
Joakim Erdfelt