Commit Graph

22530 Commits

Author SHA1 Message Date
Chris Walker dd59a0a15d Merge branch 'jetty-9.4.x' into jetty-10.0.x
# Conflicts:
#	demos/demo-jetty-webapp/src/main/webapp/favicon.ico
#	jetty-documentation/pom.xml
#	jetty-documentation/src/main/asciidoc/administration/alpn/alpn.adoc
#	jetty-documentation/src/main/asciidoc/administration/annotations/quick-annotations-setup.adoc
#	jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations-embedded.adoc
#	jetty-documentation/src/main/asciidoc/administration/annotations/using-annotations.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/cross-origin-filter.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/debug-handler.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/default-handler.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/dos-filter.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/gzip-filter.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/header-filter.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/moved-context-handler.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/qos-filter.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/resource-handler.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/rewrite-handler.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/shutdown-handler.adoc
#	jetty-documentation/src/main/asciidoc/administration/extras/statistics-handler.adoc
#	jetty-documentation/src/main/asciidoc/administration/fastcgi/configuring-fastcgi.adoc
#	jetty-documentation/src/main/asciidoc/administration/http2/configuring-haproxy.adoc
#	jetty-documentation/src/main/asciidoc/administration/http2/configuring-http2.adoc
#	jetty-documentation/src/main/asciidoc/administration/http2/configuring-push.adoc
#	jetty-documentation/src/main/asciidoc/administration/http2/enabling-http2.adoc
#	jetty-documentation/src/main/asciidoc/administration/http2/introduction.adoc
#	jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jconsole.adoc
#	jetty-documentation/src/main/asciidoc/administration/jmx/jetty-jmx-annotations.adoc
#	jetty-documentation/src/main/asciidoc/administration/jmx/using-jmx.adoc
#	jetty-documentation/src/main/asciidoc/administration/jndi/jndi-configuration.adoc
#	jetty-documentation/src/main/asciidoc/administration/jndi/jndi-datasources.adoc
#	jetty-documentation/src/main/asciidoc/administration/jndi/jndi-embedded.adoc
#	jetty-documentation/src/main/asciidoc/administration/jndi/quick-jndi-setup.adoc
#	jetty-documentation/src/main/asciidoc/administration/jndi/using-jndi.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-logging.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/configuring-jetty-request-logs.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/configuring-logging-modules.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/default-logging-with-stderrlog.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/example-apache-log4j.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging-native.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/example-java-util-logging.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/example-logback-centralized-logging.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/example-logback-sifting.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/example-logback.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/example-slf4j-multiple-loggers.adoc
#	jetty-documentation/src/main/asciidoc/administration/logging/jetty-server-dump.adoc
#	jetty-documentation/src/main/asciidoc/administration/part.adoc
#	jetty-documentation/src/main/asciidoc/administration/runner/jetty-runner.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-gcloud-datastore.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-infinispan.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-jdbc.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/legacy/session-clustering-mongodb.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/legacy/setting-session-characteristics.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/legacy/using-persistent-sessions.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-file-system.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-gcloud.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-hazelcast.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-infinispan.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-jdbc.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-memcachedsessiondatastore.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-mongodb.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-configuration-sessioncache.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/session-hierarchy.adoc
#	jetty-documentation/src/main/asciidoc/administration/sessions/sessions-usecases.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/custom-modules.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base-listconfig.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/screen-empty-base.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy-listconfig.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/screen-http-webapp-deploy.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/screen-list-logging-modules.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/screen-list-modules.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/start-jar.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/startup-base-vs-home.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/startup-classpath.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/startup-jpms.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/startup-modules.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/startup-overview.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/startup-unix-service.adoc
#	jetty-documentation/src/main/asciidoc/administration/startup/startup-windows-service.adoc
#	jetty-documentation/src/main/asciidoc/administration/tuning/garbage-collection.adoc
#	jetty-documentation/src/main/asciidoc/administration/tuning/high-load.adoc
#	jetty-documentation/src/main/asciidoc/administration/tuning/limit-load.adoc
#	jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-connectors.adoc
#	jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl-distribution.adoc
#	jetty-documentation/src/main/asciidoc/configuring/connectors/configuring-ssl.adoc
#	jetty-documentation/src/main/asciidoc/configuring/contexts/configuring-virtual-hosts.adoc
#	jetty-documentation/src/main/asciidoc/configuring/contexts/custom-error-pages.adoc
#	jetty-documentation/src/main/asciidoc/configuring/contexts/serving-webapp-from-particular-port.adoc
#	jetty-documentation/src/main/asciidoc/configuring/contexts/setting-context-path.adoc
#	jetty-documentation/src/main/asciidoc/configuring/contexts/setting-form-size.adoc
#	jetty-documentation/src/main/asciidoc/configuring/contexts/temporary-directories.adoc
#	jetty-documentation/src/main/asciidoc/configuring/deploying/configuring-specific-webapp-deployment.adoc
#	jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-architecture.adoc
#	jetty-documentation/src/main/asciidoc/configuring/deploying/deployment-processing-webapps.adoc
#	jetty-documentation/src/main/asciidoc/configuring/deploying/hot-deployment.adoc
#	jetty-documentation/src/main/asciidoc/configuring/deploying/quickstart-webapp.adoc
#	jetty-documentation/src/main/asciidoc/configuring/deploying/static-content-deployment.adoc
#	jetty-documentation/src/main/asciidoc/configuring/jsp/configuring-jsp.adoc
#	jetty-documentation/src/main/asciidoc/configuring/part.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/authentication.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/configuring-form-size.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/jaas-support.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/jetty-home-and-jetty-base.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/openid-support.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/secure-passwords.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/serving-aliased-files.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/setting-port80-access-for-non-root-user.adoc
#	jetty-documentation/src/main/asciidoc/configuring/security/spnego-support.adoc
#	jetty-documentation/src/main/asciidoc/development/ant/jetty-ant.adoc
#	jetty-documentation/src/main/asciidoc/development/clients/http/http-client-api.adoc
#	jetty-documentation/src/main/asciidoc/development/clients/http/http-client-authentication.adoc
#	jetty-documentation/src/main/asciidoc/development/clients/http/http-client-cookie.adoc
#	jetty-documentation/src/main/asciidoc/development/clients/http/http-client-intro.adoc
#	jetty-documentation/src/main/asciidoc/development/clients/http/http-client-proxy.adoc
#	jetty-documentation/src/main/asciidoc/development/clients/http/http-client-transport.adoc
#	jetty-documentation/src/main/asciidoc/development/continuations/continuations-patterns.adoc
#	jetty-documentation/src/main/asciidoc/development/continuations/continuations-using.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/embedded-examples.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/embedding-jetty.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-file-server.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-many-connectors.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-minimal-servlet.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-one-webapp.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-secured-hello-handler.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/examples/embedded-split-file-server.adoc
#	jetty-documentation/src/main/asciidoc/development/embedding/jetty-helloworld.adoc
#	jetty-documentation/src/main/asciidoc/development/frameworks/cdi.adoc
#	jetty-documentation/src/main/asciidoc/development/frameworks/metro.adoc
#	jetty-documentation/src/main/asciidoc/development/frameworks/osgi.adoc
#	jetty-documentation/src/main/asciidoc/development/frameworks/spring-usage.adoc
#	jetty-documentation/src/main/asciidoc/development/frameworks/weld.adoc
#	jetty-documentation/src/main/asciidoc/development/handlers/writing-custom-handlers.adoc
#	jetty-documentation/src/main/asciidoc/development/maven/jetty-jspc-maven-plugin.adoc
#	jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-helloworld.adoc
#	jetty-documentation/src/main/asciidoc/development/maven/jetty-maven-plugin.adoc
#	jetty-documentation/src/main/asciidoc/development/part.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/intro/chapter.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-adapter.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-annotations.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-listener.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-send-message.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-api-session.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-client-api.adoc
#	jetty-documentation/src/main/asciidoc/development/websockets/jetty/jetty-websocket-server-api.adoc
#	jetty-documentation/src/main/asciidoc/index.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/configuring/how-to-configure.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/configuring/what-to-configure.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-common-configuration.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-installing.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/getting-started/jetty-running.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/introduction/jetty-coordinates.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/introduction/what-version.adoc
#	jetty-documentation/src/main/asciidoc/quick-start/part.adoc
#	jetty-documentation/src/main/asciidoc/reference/architecture/basic-architecture.adoc
#	jetty-documentation/src/main/asciidoc/reference/architecture/jetty-classloading.adoc
#	jetty-documentation/src/main/asciidoc/reference/architecture/server-side-architecture.adoc
#	jetty-documentation/src/main/asciidoc/reference/contributing/coding-standards.adoc
#	jetty-documentation/src/main/asciidoc/reference/contributing/documentation.adoc
#	jetty-documentation/src/main/asciidoc/reference/contributing/patches.adoc
#	jetty-documentation/src/main/asciidoc/reference/contributing/release-testing.adoc
#	jetty-documentation/src/main/asciidoc/reference/contributing/releasing-jetty.adoc
#	jetty-documentation/src/main/asciidoc/reference/contributing/source-build.adoc
#	jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-eclipse.adoc
#	jetty-documentation/src/main/asciidoc/reference/debugging/debugging-with-intellij.adoc
#	jetty-documentation/src/main/asciidoc/reference/debugging/enable-remote-debugging.adoc
#	jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-env-xml.adoc
#	jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-web-xml-config.adoc
#	jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-config.adoc
#	jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-syntax.adoc
#	jetty-documentation/src/main/asciidoc/reference/jetty-xml/jetty-xml-usage.adoc
#	jetty-documentation/src/main/asciidoc/reference/jetty-xml/override-web-xml.adoc
#	jetty-documentation/src/main/asciidoc/reference/jetty-xml/webdefault-xml.adoc
#	jetty-documentation/src/main/asciidoc/reference/part.adoc
#	jetty-documentation/src/main/asciidoc/reference/platforms/cloudfoundry.adoc
#	jetty-documentation/src/main/asciidoc/reference/platforms/elastic-beanstalk.adoc
#	jetty-documentation/src/main/asciidoc/reference/troubleshooting/preventing-memory-leaks.adoc
#	jetty-documentation/src/main/asciidoc/reference/troubleshooting/troubleshooting-locked-files.adoc
#	jetty-documentation/src/main/asciidoc/reference/upgrading/upgrading-9.3-to-9.4.adoc
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/GzipWithSendErrorTest.java
2020-11-20 13:59:32 -06:00
Chris Walker 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
Joakim Erdfelt 390fa83d8e
Remove dead /jetty-spring/ module
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-20 12:12:20 -06:00
Joakim Erdfelt dfdcf3e4cc
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketUpgradeFilter 2020-11-20 12:11:41 -06:00
Simone Bordet a2c0818811 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-5691-httpinput_skip_fill_interest'. 2020-11-20 19:10:55 +01:00
Simone Bordet 428d60bc3c Javadocs fixes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-20 19:02:50 +01:00
Simone Bordet 4654335fdb Fixes #5691 - HttpInput may skip setting fill interest.
HttpInput.run() now uses contentProvider.isReady() to ensure that
if there is no content, the fill interest is set.

AsyncContentProvider.isReady() is now looping if there is content
but it cannot be transformed (e.g. too few gzipped bytes).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-20 16:52:14 +01: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
dependabot[bot] 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
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 cb10c35daf Issue #5605 - java.io.IOException: unconsumed input during http request parsing.
Fixed detection of EOF in failAllContent().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 15:21:58 +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
Simone Bordet 9caabea6bb Issue #5605 - java.io.IOException: unconsumed input during http request parsing.
Fixed FCGI's failAllContent() to correctly return whether it has seen EOF.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-19 11:00:56 +01:00
dependabot[bot] 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
Joakim Erdfelt 899e5fc0f9
Adding <module>javadoc</module> to ci profile
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-18 15:15:03 -06:00
Joakim Erdfelt aa9c6b2019
Removing javadoc parallel build (not needed)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-11-18 15:06:22 -06:00
Lachlan Roberts 7bc4ee6509 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-10.0.x-WebSocketUpgradeFilter 2020-11-19 07:48:16 +11:00
Simone Bordet e3e5c2e25a Issue #5605 - java.io.IOException: unconsumed input during http request parsing.
Writing content in separate writes may result in the server
only reading partial content, producing a response with
`Connection: close` that would cause the client socket to
stop receiving data for the next response, failing the test.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-18 21:41:08 +01: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 f533380fe8 Merge branch 'jetty-10.0.x' of github.com:eclipse/jetty.project into jetty-10.0.x 2020-11-18 14:42:24 +01:00
gregw 699e3ba54c fixed merge
Signed-off-by: gregw <gregw@webtide.com>
2020-11-18 14:42:07 +01:00
Olivier Lamy 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
Simone Bordet 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
Lachlan Roberts 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
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 2629845f17 update ByteAccumulator length on copies
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 22:16:35 +11:00
Lachlan Roberts f63a741b0f use local length field for ByteAccumulator.getLength()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 21:16:38 +11: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
Lachlan Roberts 7c46d96fce Issue #5499 - add tests for ByteBufferAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 17:11:47 +11:00