5088 Commits

Author SHA1 Message Date
Jan Bartel
0c20622648
Issue #4700 ServletContext.createXXX methods should throw UnsupportedOperationException (#4701)
* Issue #4700 ServletContext.createXXX methods should throw UnsupportedOperationException

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-25 11:17:05 +01:00
Lachlan Roberts
035c6d2639 Issue #4603 - avoid NPE during websocket HTTP/2 upgrade
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-24 14:46:06 +11:00
olivier lamy
b7a4fb7f7e Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-03-24 11:59:35 +10:00
Simone Bordet
e215d071c8 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'. 2020-03-23 16:24:04 +01:00
Greg Wilkins
d45fd14ef8 Revert rename of Response closeOutput to completeOutput #4693
Revert the rename of this method and add a deprecated completeOutput to assist those that used the temporary rename.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-23 11:16:04 +01:00
Joakim Erdfelt
7e0fff9a89
Merge pull request #4686 from eclipse/jetty-10.0.x-4685-slf4j-impl-not-included
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
2020-03-20 12:04:32 -05:00
Joakim Erdfelt
43419802b7
Issue #4685 - Declare <scope> for jetty-slf4j-impl everywhere
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 11:12:08 -05:00
Joakim Erdfelt
2c600f2b68
Issue #4685 - Mark jetty-slf4j-impl as test scope by default
+ Update logging in test-hazelcast-sessions
+ Update logging in test-infinispan-sessions

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 09:55:15 -05:00
Joakim Erdfelt
a16abe1693
Issue #4685 - jetty-slf4j-impl not a compile/runtime dependency.
+ Mark as a test dependency

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-19 17:46:41 -05:00
Simone Bordet
9cbd9ab44e Merged 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'. 2020-03-19 18:17:57 +01:00
Simone Bordet
b22c0b196f Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-03-18 17:00:01 +01:00
Simone Bordet
2940eb8ab5 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4382-h1_to_h2_upgrade'. 2020-03-18 11:44:06 +01:00
Simone Bordet
f8d9f82eff Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-4400-review_httpclient_content'. 2020-03-18 11:40:11 +01:00
Jan Bartel
1358e5d881 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-17 12:20:29 +01:00
Simone Bordet
9bb92f81bd Issue #4443 - Track backport of ALPN APIs to Java 8.
Modified jetty-alpn-openjdk8-* classes to support both
pre 8u252 (via alpn-boot) and post 8u252 (via standard API).

Replaced usages of -Xbootclasspath with -javaagent, and
using Jetty ALPN Agent jar rather than Jetty ALPN boot jar.

Removed all alpn-1.8.0*.mod files since now it is
possible to use a fixed version of the ALPN Agent
to cover all the versions.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:40:29 +01:00
Lachlan
32c9981529
Merge pull request #4674 from eclipse/jetty-9.4.x-4671-CustomRequestLog-CookieNPE
Issue #4671 - fix NPE from CustomRequestLog logRequestCookie
2020-03-17 11:01:50 +11:00
Joakim Erdfelt
57604d0955
Issue #4572 - Mechanical Change to use org.slf4j
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 15:48:25 -05:00
Joakim Erdfelt
8b7e64915f
Issue #4572 - Replace Jetty Logging with SLF4J
* Introducing jetty-slf4j-impl
* Make Jetty use org.slf4j
* Removed most of org.eclipse.jetty.util.log classes
* Left org.eclipse.jetty.util.log.Log and
       org.eclipse.jetty.util.log.Logger but as
  simple bridge classes that are deprecated
* Migrated code using org.eclipse.jetty.util.log.StacklessLogging
  to org.eclipse.jetty.logging.StacklessLogging found in
  the jetty-slf4j-impl
* Moved logging start modules from jetty-util to jetty-home
* Simplified logging start modules
* Updated code that was using StdErrLog directly
* Updating module-info.java for org.slf4j
* removing org.eclipse.jetty.util.log.class references
* jetty-start supports manually declared default provider
  + and we use it to default "logging" to the "logging-jetty" provider
* Cleaning up jetty-maven-plugin and IT testing for Logging
* Using old slf4j for it testing
* Updating compiler config to show Xlint:exports warnings
* Updating console-capture and logging-noop
* Adding slf4j bridge (capture) jetty modules
* Updates to jetty logging module locations
* Changing reference to slf4j dependent mod
* Process requested enabled modules in topological order
* Limiting inclusions in shaded jetty-start
  + Also adding note to jetty-util classes that are used by
    jetty-start
* Default logging level on baseline logging config is INFO (not DEBUG)
* Changing from system to server classes in logging
* Updating other modules to use new logging names

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-16 11:21:54 -05:00
Greg Wilkins
ca74fbeb32 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-16 10:23:58 +01:00
Lachlan Roberts
288caa99f7 Issue #4671 - fix NPE from CustomRequestLog logRequestCookie
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-16 11:17:09 +11:00
Lachlan
b497827df0
Merge pull request #4648 from eclipse/jetty-9.4.x-4645-forwardedPortException
Issue #4645 - better error message for empty X-Forwarded-Port value
2020-03-16 10:35:08 +11:00
Simone Bordet
466517a0e8 Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
* Moved implementation of UpgradeTo from HTTP2ServerConnection
  to HTTP2Connection, since now also the client connection
  can be upgraded to.
* Split HTTP2Session.newStream(), since now the client must
  be able to create the implicit stream 1 corresponding to
  the HTTP/1.1 upgrade request, so that the HTTP/2 response
  after the upgrade finds the stream.
* The HTTP/1.1 upgrade mechanism has been generalized.
  Before it was based on HttpConnectionUpgrader and a hook
  in HttpChannelOverHTTP.exchangeTerminating().
  Now it is based on UpgradeProtocolHandler that when sees
  a 101 response it will trigger the upgrade mechanism.
* Introduced ConnectionPool.accept(Connection) to transfer
  a connection from the HTTP/1.1 connection pool to the
  HTTP/2 connection pool after the upgrade.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-13 15:59:13 +01:00
Lachlan Roberts
fcbe704b24 Issue #4645 - do not wrap exceptions from onError with RuntimeException
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-13 13:59:43 +11:00
Lachlan Roberts
633298b5c7 Issue #4645 - changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-11 22:41:31 +11:00
Lachlan Roberts
d5ee7b058b Issue #4645 - handle exceptions from all headers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-11 18:41:41 +11:00
Lachlan Roberts
dbd89ce1c7 Issue #4645 - validate port range & return 400 on bad forwarded headers
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-11 18:31:25 +11:00
Greg Wilkins
28d6009ac5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-03-10 15:14:56 +01:00
Joakim Erdfelt
965483e4d9
Issue #4631 - Warning about skipping of <Arg> nodes is in wrong place for <Configure> (#4632)
* Issue #4631 - Fixing XML comment that was accidentally reformatted

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4631 - Warning about skipping of <Arg> nodes is in wrong place for <Configure>

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4631 - Improving testcase

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4631 - Removing test classes

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4631 - Cleaning up configure with index per PR review

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4631 - More named arg test cases

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Issue #4631 - Add testConfiguredWithNamedArgNotFirst

+ new testcase where <Arg> is needed, but is not the first node

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

* Cleanup configuration index usage

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

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2020-03-10 15:11:22 +01:00
Jan Bartel
dfa0e0adf7
Jetty 10.0.x 4507 forwardincludemappings (#4590)
* Issue #4507 Implement forward/include/async params for HttpServletMapping

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-10 11:05:52 +01:00
Lachlan Roberts
797d25505b Issue #4645 - better error message for empty X-Forwarded-Port value
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-09 13:01:52 +11:00
Lachlan Roberts
2897377370 Issue #4577 - request getPathInfo() could be null in InetAccessHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-02 14:32:52 +11:00
Lachlan Roberts
95ecb4a3e8 Issue #4598 - Changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-29 16:14:20 +11:00
Simone Bordet
1393c0e92b Issue #4400 - Review HttpClient's ContentProvider.
Introduced Request.Content with a reactive model to provide
request content.
Introduced RequestContentAdapter to wrap ContentProviders
into Request.Content.
Updated implementation to use the reactive model rather than
the old pull model.
Reimplemented all ContentProviders in terms of Request.Content.
Converted most of the tests from ContentProvider to Request.Content.
Updated proxy servlets and documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-28 14:40:48 +01:00
Joakim Erdfelt
8aabb52557 Updating to version 9.4.28-SNAPSHOT 2020-02-27 13:03:44 -06:00
Joakim Erdfelt
a304fd9f35 Updating to version 9.4.27.v20200227 2020-02-27 12:21:57 -06:00
Lachlan Roberts
ccd6c845e5 Merge remote-tracking branch 'origin/jetty-9.4.x-4598-InetAccessHandler' into jetty-10.0.x-4598-InetAccessHandler 2020-02-27 19:34:16 +11:00
Lachlan Roberts
2edc4920fd Issue #4598 - fix InetAccessHandlerTest expectations to fit new behavior
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 18:29:29 +11:00
Lachlan Roberts
3c551e960c Issue #4598 - rework InetAccessHandler to use only one IncludeExcludeSet
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-27 15:41:35 +11:00
Joakim Erdfelt
99a541f051
Fixing checkstyle violations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-02-26 13:16:32 -06:00
Jan Bartel
2faec44dfb Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-02-26 16:40:35 +01:00
Hirotaka Ikoma
65a22e5e80
Fix NPE in HouseKeeper.stopScavenging (#4604)
* Fix NPE in HouseKeeper.stopScavenging

Signed-off-by: Hirotaka Ikoma <hikoma@gmail.com>
2020-02-26 16:38:50 +01:00
Greg Wilkins
277ce5f3a5 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-02-26 14:36:22 +01:00
Greg Wilkins
9bb6840658
Fixes #4577 IPAccessHandler in context (#4580)
* Fixes #4577 IPAccessHandler in context

Fixes and tests #4577 IPAccessHandler in context by using target instead of pathInfo for path matching.

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

* Tests #4577 IPAccessHandler target

Updates from review.

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

* Issue #4577 IpAccessHandler NPE

Match on full URI path rather than target.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-25 08:46:02 +01:00
Lachlan Roberts
bb7e48043d Issue #4598 - Add URI mapping to InetAccessHandler
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-02-25 14:58:48 +11:00
Greg Wilkins
03359ec089
Tests #4594 ContextListener removed (#4595)
Remove ContextListeners from the destroy list when removed.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-22 10:43:36 +01:00
Simone Bordet
b0975aaba0 Fixes #4540 - ProxyConnectionFactory should not ignore TLVs.
Generified the API to expose TLVs, so that they are all exposed,
not only the custom TLV types in the 0xE0-0xEF range.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-02-21 09:37:12 +01:00
Simone Bordet
411624c419 Merge branch 'issue_4540' of https://github.com/m0mus/jetty.project into m0mus-issue_4540 2020-02-21 08:45:21 +01:00
Simone Bordet
0fc12b0681 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-02-20 11:23:49 +01:00
Simone Bordet
2958cb1d62
Merge pull request #4544 from eclipse/jetty-9.4.x-4541-OptimalLargeResponseHeader
Issue #4541 Large response header
2020-02-20 11:17:39 +01:00
Greg Wilkins
b46b25b450 release buffer on overflow
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-02-19 22:38:58 +01:00