ce11fb3e94
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-websocketProxy
2020-11-25 23:05:51 +11:00
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
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
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
1c7c924228
Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x
2020-11-24 13:29:46 -06:00
4582088d89
Reducing test disk space usage on CI
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-24 13:29:34 -06:00
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
b89adb8dae
Improve WebSocketProxy, and write tests for it
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 18:55:09 +11:00
d7598f3ff2
basic WebSocketProxy implementation
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-24 13:40:48 +11:00
d0a7c881c2
skip tests must be dynamic
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-24 12:35:47 +10:00
056ce8d92e
Bump maven-jxr-plugin from 2.5 to 3.0.0 ( #5672 )
...
Bumps [maven-jxr-plugin](https://github.com/apache/maven-jxr ) from 2.5 to 3.0.0.
- [Release notes](https://github.com/apache/maven-jxr/releases )
- [Commits](https://github.com/apache/maven-jxr/compare/jxr-2.5...jxr-3.0.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-24 09:58:43 +10:00
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
fe65023f61
Bump maven-pmd-plugin from 3.13.0 to 3.14.0 ( #5709 )
...
Bumps [maven-pmd-plugin](https://github.com/apache/maven-pmd-plugin ) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/apache/maven-pmd-plugin/releases )
- [Commits](https://github.com/apache/maven-pmd-plugin/compare/maven-pmd-plugin-3.13.0...maven-pmd-plugin-3.14.0 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-24 07:14:32 +10:00
e8683cba9f
Updating to version 9.4.36-SNAPSHOT
2020-11-20 16:05:27 -06:00
bdc54f03a5
Updating to version 9.4.35.v20201120
2020-11-20 15:05:50 -06:00
41bf9534eb
Issue #5603 - Single page documentation ( #5636 )
...
* First pass of single page doc generation for 9.4.x
* Updates to POM and HTML assembly
* Update snapshot version
* Removing deprecated Docbook assets
* Moving asciidoc config to main pom, removing sub-order references
* Fixing image links
* Cleaning up code reference formatting
* Fixing missed source formatting
* Flipping Admonitions MK. I
* Replacing underscores for admonitions
* Converting .... to ---- for code blocks
* Reverting accidentally changed KEYS.txt
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
* Clean up
* Fixing icons
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-20 13:05:42 -06:00
fcfa72ee40
Bump javax.servlet.jsp.jstl from 1.2.2 to 1.2.5 ( #5673 )
...
Bumps [javax.servlet.jsp.jstl](https://github.com/javaee/jstl-api ) from 1.2.2 to 1.2.5.
- [Release notes](https://github.com/javaee/jstl-api/releases )
- [Commits](https://github.com/javaee/jstl-api/compare/1.2.2...impl-1.2.5 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-20 14:21:17 +10:00
901a17d197
Issue #5605 - Adding more comments
...
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-19 10:24:36 -06:00
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
d4feb4f29d
Removed unused code.
...
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 16:08:31 +01:00
248779e195
Bump grpc-core from 1.33.0 to 1.33.1 ( #5623 )
...
Bumps [grpc-core](https://github.com/grpc/grpc-java ) from 1.33.0 to 1.33.1.
- [Release notes](https://github.com/grpc/grpc-java/releases )
- [Commits](https://github.com/grpc/grpc-java/compare/v1.33.0...v1.33.1 )
Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2020-11-19 14:31:24 +10:00
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
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
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
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
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
2629845f17
update ByteAccumulator length on copies
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 22:16:35 +11:00
f63a741b0f
use local length field for ByteAccumulator.getLength()
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 21:16:38 +11:00
3c4e259dc2
fail quickly
...
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-11-17 16:33:39 +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
7c46d96fce
Issue #5499 - add tests for ByteBufferAccumulator
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 17:11:47 +11: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
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
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
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
881cb746b1
Bump jetty-version-maven-plugin from 2.6 to 2.7
...
Bumps [jetty-version-maven-plugin](https://github.com/jetty-project/jetty-version-maven-plugin ) from 2.6 to 2.7.
- [Release notes](https://github.com/jetty-project/jetty-version-maven-plugin/releases )
- [Commits](https://github.com/jetty-project/jetty-version-maven-plugin/compare/jetty-version-maven-plugin-2.6...jetty-version-maven-plugin-2.7 )
Signed-off-by: dependabot[bot] <support@github.com>
2020-11-16 14:07:02 +00:00
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
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
5788fe609d
Fix ByteBufferAccumulator minSize
...
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 18:43:22 +11:00
Lachlan Roberts
dependabot[bot]
Chris Walker
Joakim Erdfelt
Greg Wilkins
olivier lamy
Simone Bordet