Commit Graph

17798 Commits

Author SHA1 Message Date
Jesse Wilson 37cfb2fa86 Issue #4714 Updating lastRemoteStreamId on refused streams
Signed-off-by: Jesse Wilson <jwilson@squareup.com>
2020-03-25 22:02:20 -04:00
Simone Bordet e0eb25515b
Merge pull request #4712 from eclipse/jetty-9.4.x-4711-ResetTrailers
Reset trailers on recycled response
2020-03-25 15:09:51 +01:00
Simone Bordet 1a3f39eef1 Issue #4711 - Reset trailers.
Test code cleanup.
Added test for Response.reset().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-25 15:08:43 +01:00
Greg Wilkins f4da9760fd Reset trailers on recycled response
Whilst investigating #4711 for jetty-10, it was noticed that trailers are not nulled on recycled Response instances, nor on reset.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-03-25 13:47:34 +01:00
Olivier Lamy e913ed233a
Issue #4654 Hazelcast configurationLocation is not configurable via mod files (#4655)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-24 11:51:01 +10:00
Greg Wilkins 48cc21ca6d Merge branch 'jetty-9.4.x' of github.com:eclipse/jetty.project into jetty-9.4.x 2020-03-23 17:00:17 +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
Andrej Krota d445d7eb5d
Fixed InfinispanSessionData serialization issues when using infinispan (#4600)
* Fixed InfinispanSessionData serialization issues when using infinispan
embedded
* Added version to InfinispanSessionDataSerializer
* Refactored InfinispanSessionDataSerializer to make use of
SessionDataMarshaller
* Tests with and without storeAsBinary enabled
* Merged InfinispanSessionDataSerializer and SessionDataMarshaller
* Wrapped Object Input/Output to Input/Output Streams
* Fixed an issue when reading the session data from a file.
* Modified tests to force read from file if available.
* static lazy init serializationContext
* synchronized initSerializationContext

Signed-off-by: Andrej Krota <andrej.krota@gmail.com>
2020-03-23 11:14:01 +01:00
Chris Walker 34488b71b6
Updating Weld documentation. Resolves #3935 2020-03-20 14:26:13 -05:00
Lachlan 6dc5792301
Merge pull request #4680 from eclipse/jetty-9.4.x-4673-MultiPart
Issue #4673 - fix MultiPart parsing for content split in boundary
2020-03-19 08:49:07 +11:00
Simone Bordet 42c4d9b38a Issue #4443 - Track backport of ALPN APIs to Java 8.
Updated documentation.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-18 16:41:02 +01:00
Simone Bordet 91c1b52e66
Merge pull request #4678 from eclipse/jetty-9.4.x-4443-alpn-backport-8u252
Issue #4443 - Track backport of ALPN APIs to Java 8.
2020-03-18 15:35:31 +01:00
Simone Bordet 1be2f47424 Issue #4443 - Track backport of ALPN APIs to Java 8.
Improved logging after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-18 15:32:28 +01:00
Simone Bordet 6df47dd183 Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4443-alpn-backport-8u252'. 2020-03-18 10:57:23 +01:00
Lachlan Roberts c658ae7056 Issue #4673 - fix MultiPart parsing for content split in boundary
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-18 11:22:40 +11:00
Simone Bordet 785b640327 Fixes #2896 - Wrong Certificate Selected When Using Multiple Virtual Host Names in Conscrypt
Updating to a Conscrypt version that supports this feature.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 23:40:38 +01:00
Lachlan a9ef2d0d74
Merge pull request #4664 from eclipse/jetty-9.4.x-4650-RemoteEndpointFactory
Issue #4650 - do not use ServiceLoader every time a WSSession is started
2020-03-18 09:39:06 +11:00
Jan Bartel a8a9dbbc08
Issue #4644 Allow jetty-env EnvEntry to override empty env-entry (#4660)
* Issue #4644 Allow jetty-env EnvEntry to override empty env-entry

Signed-off-by: Jan Bartel <janb@webtide.com>
2020-03-17 11:47:15 +01:00
Simone Bordet c224b88e58 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-03-17 11:45:06 +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
Simone Bordet adb0b06c8f Issue #4443 - Track backport of ALPN APIs to Java 8.
Continuous integration builds for Jetty 9.3.x are now done with Java 9.
Jetty 9.3.x needs Java 9+ to be built in order to build also the ALPN
modules that depend on Java 9 APIs.
Jetty 9.3.x would not be buildable with OpenJDK 8u252 or later,
but it is an EOL branch and required Java 9 to be built anyway.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 11:36:00 +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
Simone Bordet bc60ff1c74 Fixes #4676 - ALPN support for Java 15.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-16 11:12:39 +01:00
Simone Bordet 665d1c8122 Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-03-16 11:07:32 +01:00
Simone Bordet 4d6386d914 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-03-16 11:06:11 +01:00
Denny Abraham Cheriyan ce8d2ef168 Refactor CrossOriginFilter with small perf improvements (#4672)
* Refactor CrossOriginFilter

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>

* Fix checkstyle violation

Signed-off-by: Denny Abraham Cheriyan <dennyac@gmail.com>
2020-03-16 10:23:04 +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
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 3d74148652 Issue #4650 - do not use ServiceLoader every time a WSSession is started
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-12 12:34:03 +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
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
Mattias Andersson 82247f257d Issue #4647 Hazelcast remote.xml configuration file do not configure hazelcast remote addresses (#4649)
* Fix for #4647

Signed-off-by: Mattias Andersson <andermaj@gmail.com>

Co-authored-by: Mattias Andersson <andermaj@gmail.com>
2020-03-10 10:35:48 +10: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
olivier lamy 67eb9b3531 use same version as in pom
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-08 21:10:39 +10:00
Simone Bordet 1a165aadec Using JDK 7 for javadocs.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 22:05:43 +01:00
Simone Bordet 273b729803 Updated build to JDK 8 otherwise TLS communication with
Maven Central fails due to outdated TLS version/ciphers.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 21:15:13 +01:00
Simone Bordet 9182e30443 Fixed OSGi tests by overriding the Maven Central
location used by pax-exam.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 19:49:44 +01:00
Simone Bordet ac724a108d Ignored ExternalSiteTest for reliability.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 19:48:53 +01:00
Simone Bordet 36c7fe8d42 Updated URLs for Maven Central and GitHub.
From http://central.maven.org
to https://repo1.maven.org

From http://raw.githubusercontent.com/.../master/...
to https://github.com/.../raw/jetty-9.2.x/...

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 18:57:45 +01:00
Simone Bordet c1dc03a440 Issue #4443 - Track backport of ALPN APIs to Java 8
For Jetty 9.2.x, supporting the backport of the JDK ALPN APIs
of JDK 8u252 would have required a number of backports from
Jetty 9.4.x.
Rather than doing all that work for an EOL Jetty branch, we
instead excluded the modules/tests that required ALPN, so
that the Jetty 9.2.x branch can still be built with 8u252
or later, but it will lack some of the artifacts.
Users needing those artifacts are encouraged to move to
Jetty 9.4.x or later.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-07 18:53:49 +01:00
Olivier Lamy 3a77542303
upgrade shade plugin and align version (#4639)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-05 09:10:12 +10:00
Joakim Erdfelt f150062fde
Merge pull request #4629 from eclipse/jetty-9.4.x-4628-optional-depends
Issue #4628 - Non-Required Module Dependency Support
2020-03-03 11:44:49 -06:00
Joakim Erdfelt c08ca2a16e
Merge pull request #4630 from eclipse/jetty-9.4.x-4620-console-capture
Issue #4620 - Better support for alt PrintStream in StdErrLog
2020-03-03 11:43:55 -06:00
Olivier Lamy 3a8b45d20c
Issue #4619 align derby version (#4626)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-03-03 10:20:27 +10:00
Lachlan 9ef7790e45
Merge pull request #4624 from eclipse/jetty-9.4.x-4123-OpenId_Docs
Issue #4123 - add documentation for OpenID to 9.4.x
2020-03-03 10:40:49 +11:00
Joakim Erdfelt f2a4c6b615
Issue #4620 - Better support for alt PrintStream in StdErrLog
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-02 12:03:37 -06:00
Joakim Erdfelt 1ee8c8ad3a
Issue #4628 - Non-Required Module Dependency Support
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-02 10:13:29 -06:00