Commit Graph

20954 Commits

Author SHA1 Message Date
olivier lamy a83c1a95d0 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-05-27 18:21:58 +10:00
Greg Wilkins b8c7a9509a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-05-27 10:11:51 +02:00
Greg Wilkins e82cacfdb6
Jetty 9.4.x single context optimisation (#4909)
* Optimisation for single context

It is a frequent deployment mode to have only a single context.
In that case, the ContextHandlerCollection can bypass a bit of
looping/matching/selecting and just call the single context,
which it works out itself anyway if the request applies to it.

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

* Optimisation for single context

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-05-27 09:53:13 +02:00
olivier lamy 2b1fa80b63 always run the test except if Docker not available
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 16:00:23 +10:00
olivier lamy 7cc3573ceb remove derby system property
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 16:00:23 +10:00
olivier lamy 389f46c826 bye bye Derby tests, only use mariadb via container
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 16:00:23 +10:00
olivier lamy 1249763aad remove changes to DatabaseAdaptor with new fields username/password, use our own username/password in maria_db tests
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 16:00:23 +10:00
olivier lamy c05bd6c26d use testcontainers/docker to run jdbc sessions tests with Mariadb remote
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-27 16:00:23 +10:00
Lachlan 0b8306976a
Merge pull request #4906 from eclipse/jetty-9.4.x-4903-WebSocketPublicModifier
Issue #4903 - give better errors for non public javax.websocket endpoints
2020-05-27 09:43:24 +10:00
Lachlan Roberts a11c7f554c Issue #4903 - cleanup catch statement from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-27 09:42:44 +10:00
Lachlan Roberts 5c63b0ef78 Issue #4903 - catch Throwable instead of RuntimeException
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 17:37:04 +10:00
Lachlan Roberts c41560c7cd Issue #4903 - add cause to Exception when creating endpoint instance
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 15:35:39 +10:00
Lachlan Roberts 5d876d46db Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-05-26 10:44:16 +10:00
Lachlan 94c8edc02e
Merge pull request #4881 from eclipse/jetty-10.0.x-WebSocketCoreRefactor
Issue #2173 & #2174 - separate out client and server parts of websocket-core
2020-05-26 09:47:00 +10:00
Lachlan Roberts 94f79f8f26 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-05-26 09:44:25 +10:00
Lachlan Roberts 470d948504 Issue #4903 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-26 09:35:17 +10:00
Joakim Erdfelt 051e102122
Merge remote-tracking branch 'origin/release-9.4.29' into jetty-9.4.x 2020-05-25 08:43:41 -05:00
Lachlan 4611379c86
Merge pull request #4882 from eclipse/jetty-9.4.x-4873-ExecutorThreadPoolJoin
Issue #4873 - fix timeout on ExecutorThreadPool.join()
2020-05-25 14:07:28 +10:00
Lachlan Roberts add00c9dd8 Issue #4903 - check endpoint class is default constructable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-25 13:57:41 +10:00
Lachlan Roberts 28a588b8bd Issue #4903 - Better errors for non public endpoints
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-25 12:36:09 +10:00
Lachlan Roberts 74f9b464a6 Issue #4873 - generalize test for all ThreadPools
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-22 10:49:42 +10:00
Joakim Erdfelt 5d6f3e2ddc Updating to version 9.4.30-SNAPSHOT 2020-05-21 13:42:25 -05:00
Joakim Erdfelt 77c232aed8 Updating to version 9.4.29.v20200521 2020-05-21 12:04:14 -05:00
Simone Bordet 3af43c8ac3 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-05-21 18:36:36 +02:00
Simone Bordet a54775847e
Merge pull request #4893 from eclipse/jetty-9.4.x-4892-async_json_parser
Fixes #4892 - Non-blocking JSON parser.
2020-05-21 18:20:51 +02:00
Greg Wilkins b9466823c8 Issue #4892 Async JSON
Handle encoded cached strings (or not).

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-05-21 11:44:30 +02:00
Simone Bordet d16ce12349 Fixes #4892 - Non-blocking JSON parser.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-21 00:35:31 +02:00
Jan Bartel b3f9652e72 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-05-20 23:14:16 +02:00
Simone Bordet b30c31e5c4
Merge pull request #4876 from eclipse/jetty-9.4.x-4836-ssl_client_rst_after_idle_timeout
Issue #4836 - Too Many Files Error with AWS ALB.
2020-05-20 23:07:01 +02:00
Jan Bartel 42e46aee49 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-05-20 23:06:27 +02:00
Jan Bartel 52e7dd4873
Issue #4895 SessionCache flushOnResponseCommit with invalid session (#4896)
Signed-off-by: Jan Bartel <janb@webtide.com>
2020-05-20 23:05:53 +02:00
Simone Bordet e588a1bd9d Fixes #4892 - Non-blocking JSON parser.
Added parse(byte[], int, int).

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-20 16:14:05 +02:00
Greg Wilkins 4e8aec47e5 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-05-20 16:09:55 +02:00
Lachlan 8d5430bc60
Issue #4741 - fix issues with HttpServletMapping (#4851)
* Issue #4741 - fixes to jetty implementation of HttpServletMapping

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #4741 - don't lazily generate HttpServletMapping to preserve servletName

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #4741 - tests should expect no leading / for matchValue

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* resolving TODOs from review

- removed pathSpec from Request
- getServletMapping moved to ServletHandler

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #4741 - only create HttpServletMapping for exact matches once

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* use wrapped attributes for async dispatch

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #4741 - Changes from review, revert async attribute wrapping

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #4741 - Changes from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>

* Issue #4741 Async ServletMapping

Greatly increased the scope of this PR by combining the servletPath and
pathInfo into the ServletPathMapping class that implements the
HttpServletPathMapping interface.    This allows us to greatly simplify
the matching of servlets and reduce the number of times we need to
actually to the match per request.

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

* Issue #4741 Async ServletMapping

Fixed problems with previous commit
more cleanup of attributes in dispatcher.

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

* Issue #4741 Async ServletMapping

More code cleanups

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

* Issue #4741 Async ServletMapping

Named dispatch cleanup

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

* Issue #4741 Async ServletMapping

misc cleanup

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

* Issue #4741 Async HttpServletMapping

Added tests for named dispatchers
Do not use ServletPathMapping for named dispatch

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

* Issue #4741 Async HttpServletMapping

renamed confusing isDefault method on ServletMapping

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

* Issue #4741 Async HttpServletMapping

simplified setAttribute

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

* Issue #4741 Async HttpServletMapping

added javadoc about AsyncAttributes

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

* Issue #4741 Async HttpServletMapping

Fixed javadoc

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

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2020-05-20 15:23:32 +02:00
Simone Bordet 9ad7ff795e Fixes #4892 - Non-blocking JSON parser.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-20 15:12:24 +02:00
Simone Bordet f2ef054b28 Fixes #4892 - Non-blocking JSON parser.
Added javadocs.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-20 14:03:30 +02:00
Simone Bordet bed046f01c Fixes #4892 - Non-blocking JSON parser.
Fixed checkstyle.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-20 13:08:02 +02:00
Simone Bordet caf2592587 Fixes #4892 - Non-blocking JSON parser.
Fixed copyright header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-20 13:00:29 +02:00
Simone Bordet 3ead429476 Fixes #4892 - Non-blocking JSON parser.
Implemented non-blocking JSON parser.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-20 12:35:16 +02:00
Greg Wilkins 3845790c5d Hpack optimizations
If the dynamic table size is already 0, do not evictAll.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-05-20 10:47:23 +02:00
olivier lamy 3cbd8cc5c2 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-05-20 11:46:29 +10:00
olivier lamy 598accfd3a Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-05-20 11:43:33 +10:00
olivier lamy bf088f9c5a use jetty jakarta websocket api released version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-20 11:36:52 +10:00
Lachlan Roberts ae0b70fbfc Issue #4873 - add test to reproduce the ExecutorThreadPool.join() issue
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-20 00:45:05 +10:00
olivier lamy 0d13031a32 fix jetty-jakarta-websocket-api version
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-19 20:14:37 +10:00
Simone Bordet beda43c2cb
Merge pull request #4839 from eclipse/jetty-10.0.x-4830-jetty-slf4j-impl-with-jmx-2
Issue #4830 - Enabling JMX on jetty-slf4j-impl
2020-05-19 09:38:49 +02:00
Olivier Lamy 3215e11b3f
Issue #4887 update documentation org.apache.aries.spifly.dynamic.bundle version 1.2.4 2020-05-19 16:28:53 +10:00
Lachlan Roberts 590b1a6ab1 Issue #4873 - fix timeout on ExecutorThreadPool.join()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-05-18 11:49:12 +10:00
olivier lamy f27a972a60 fix merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-05-16 20:46:55 +10:00
olivier lamy 45690ad09b Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-05-16 20:31:01 +10:00