Commit Graph

20111 Commits

Author SHA1 Message Date
Joakim Erdfelt a5e31dce20
Merge pull request #4386 from eclipse/jetty-9.4.x-4385-sslcontextfactory-sni-noexception
Issue #4385 - Limit new UnsupportedOperationException to direct SslContextFactory usage
2019-12-03 10:05:56 -06:00
Simone Bordet 839846d9a6 Fixes #4392 - Suppress logging of QuietException in HttpChannelState.asyncError().
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-03 13:01:28 +01:00
Simone Bordet 9628ea3bc1 Fixes #3512 - File descriptor is not released after zip file uploaded via jetty-client.
In case of multiple parts only the last iterator was closed.
Now, every part's iterator is closed.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-03 11:36:53 +01:00
Greg Wilkins 5545e906f0 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-03 12:52:29 +11:00
Jan Bartel db9ad2fcec
Issue #4323 Ensure QoSFilter handles IllegalStateException (#4372)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-03 12:16:24 +11:00
Jan Bartel f99eb29195
Issue #4369 Update jsp documenation; remove old config from webdefault.xml (#4384)
* Issue #4369 Update jsp documenation; remove old config from webdefault.xml

Signed-off-by: Jan Bartel <janb@webtide.com>
2019-12-03 12:15:02 +11:00
Joakim Erdfelt d1376c71eb
Issue #4385 - Correcting exception variable name.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 16:02:18 -06:00
Joakim Erdfelt 65738e770f
Issue #4385 - Fixing client testcase assertion
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 16:00:37 -06:00
Greg Wilkins 85cda88b40
Issue #4376 Async Content Complete (#4377)
* Issue #4376 Async Content Complete

Added test harness to reproduce unready completing write.
Fixed test by not closing output prior to becoming READY

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

* Issue #4376 Async Content Complete

ERROR state still needs to be closed!

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

* Issue #4376 Async Content Complete

close after last blocking write

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

* Issue #4376 Async Content Complete

If completion has to do a flush, then we need a call to closed to
avoid leaking buffers.

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

* Issue #4376 Async Content Complete

Reformat

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-03 08:50:36 +11:00
Joakim Erdfelt c0f8a46c35
Merge branch 'jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>

# Conflicts:
#	jetty-maven-plugin/src/main/java/org/eclipse/jetty/maven/plugin/JettyRunDistro.java
2019-12-02 15:29:30 -06:00
Joakim Erdfelt d99ae19201
Merge pull request #4290 from eclipse/jetty-9.4.x-4269-restore-PrintWriter-contract
Issue #4269 - Restoring PrintWriter contract on errors
2019-12-02 15:22:22 -06:00
Mat Booth c9a65c4676 Allow building against newest version of maven-artifact-transfer (#4381)
In later versions of maven-artifact-transfer the package names have
been refactored, this change accomodates for that.

Signed-off-by: Mat Booth <mat.booth@redhat.com>
2019-12-03 07:08:01 +10:00
Joakim Erdfelt 5b1f9d5f15
Issue #4385 - Client no longer needs override.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 12:15:02 -06:00
Joakim Erdfelt 816e34bddf
Issue #4385 - Base Class usage now is a WARN logging event in SNI usage
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 12:13:13 -06:00
Joakim Erdfelt e1d64af578
Issue #4385 - Minimize impact of deprecated SNI mode on base class
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 12:00:21 -06:00
Joakim Erdfelt 666ee4ef60
Issue #4385 - Remove UnsupportedOperationException in SslContextFactory
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 10:57:15 -06:00
Joakim Erdfelt 60f00d43c8
Restoring date of release 10.0.0-alpha0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-02 10:23:18 -06:00
Joakim Erdfelt 10736f332b
Merge branch 'release-10.0.0.alpha1' into jetty-10.0.x 2019-12-02 10:21:37 -06:00
Lachlan afb81ed738
Issue #4349 - test client negotiation of internal extensions (#4355)
Added tests for WebSocket client negotiation of requested internal extensions. Changed the algorithm to remove from the requested list rather than add to the negotiated one.

Fixed other issues with the parsing of ExtensionConfig not giving correct errors for invalid content.
2019-12-02 08:45:32 +11:00
Simone Bordet 902603fc9e Fixes #4374 - Jetty client: Response.AsyncContentListener.onContent is not called.
Now the various content listeners inherit from each other, like
it should have been from the beginning.
This also allowed to remove code duplication due to the default
implementation of the methods in various places.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-29 12:05:30 +01:00
Simone Bordet b4fa776b50 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2019-11-29 11:13:32 +01:00
Lachlan acbc87a5da
Issue #4341 - do not modify payload ByteBuffer sending WebSocket frames (#4359)
- test that Frame buffer is unchanged after sending
- Generator and FrameFlusher no longer modify frame payload
- permessage-deflate no longer modify frame payload
- remove Buffer allocation from Generator
- outgoing autoFragment no longer modifies buffer
- minor cleanups and optimizations from review

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-29 08:41:20 +11:00
Simone Bordet 3b817821e7
Merge pull request #3740 from eclipse/jetty-10.0.x-3537-bootstrap_websocket_http2
Issue #3537 - Bootstrap websocket on HTTP/2
2019-11-28 15:47:26 +01:00
Simone Bordet d7cf3729a5
Merge pull request #4354 from eclipse/jetty-9.4.x-4351-lazy-servlet-init-not-atomic
Issue #4351 Lazy servlet init is not atomic
2019-11-28 11:44:38 +01:00
Simone Bordet dc0fac5806 Issue #4351 - Lazy servlet init is not atomic.
Code cleanup.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-11-28 11:07:24 +01:00
olivier lamy d321c2f034 checkstyle
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-28 14:15:54 +10:00
olivier lamy 1b49e72d59 formatting
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-28 13:44:49 +10:00
olivier lamy e58f570266 remove unused import
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-28 13:42:52 +10:00
Lachlan Roberts e9c3eb0d73 remove duplicate TestFrameHandler from websocket core tests
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-28 14:27:00 +11:00
olivier lamy 9576763c67 avoid non necessary objects allocation if session do not have any attributes data
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-28 11:15:48 +10:00
Lachlan Roberts 7ebf673ad3 fix merge for DemoBaseTests.testSessionDump() to Jetty 10
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-28 10:37:54 +11:00
Lachlan e8746ecf44
Merge pull request #4371 from lachlan-roberts/jetty-10.0.x-4368-MultiPartsReview
Issue #4368 - remove MultiParts interface and simplify MultiPart cleanup
2019-11-28 09:59:10 +11:00
Jan Bartel 07efbb728d Issue #4351 Lessen wait times.
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-28 09:34:39 +11:00
Jan Bartel a6cdec548c Revert "Issue #4351 Found simpler test"
This reverts commit 5bc6593337.
2019-11-28 09:16:14 +11:00
Joakim Erdfelt 4af28579f0
Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-27 05:52:44 -06:00
Joakim Erdfelt 380cebc3bb
Merge pull request #4337 from eclipse/jetty-9.4.x-4329-rewrite-rules-demobase
Issue #4329 - Fixing RuleContainer to handle path parameters
2019-11-27 05:52:15 -06:00
Joakim Erdfelt 15c9f0bfc2
Issue #4329 - Cleaning up SessionDump
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-11-27 05:51:39 -06:00
Joakim Erdfelt de3ff4726e
Merge pull request #4336 from eclipse/jetty-9.4.x-2195-jvm-arg-expansion
Fixes #2195 - Jetty start.jar can expand properties in JVM Args now
2019-11-27 05:47:12 -06:00
Lachlan Roberts 76bb8d2327 Issue #4368 directly use MultiPartFormInputStream instead of MultiParts
MultiPart cleanup is now done in Request.onCompleted()

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-27 17:20:01 +11:00
Lachlan Roberts 6988c4feaa Issue #4368 - make MultiParts a class instead of interface
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-27 15:35:21 +11:00
Jan Bartel 02bb5affd9 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 15:32:04 +11:00
Jan Bartel c440a3f972
Issue #4363 Restore contextXml config for jetty maven plugin (#4367)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 14:56:59 +11:00
Lachlan 9dbdb97529
Merge pull request #4324 from eclipse/jetty-10.0.x-4315-OnlyStopWSSessionsOnce
Issue #4315 - stop WebSocketSessions only after onClose
2019-11-27 14:24:31 +11:00
Lachlan Roberts 2410f9d6c4 Issue #4315 - Jetty and Javax WebSocketSessions are no longer LifeCycles
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2019-11-27 13:51:14 +11:00
Jan Bartel 149ac97b6f Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 11:58:12 +11:00
Jan Bartel cfd21864cf
Issue #4350 Remove exclude of MultiInputStreamParser from jetty-util osgi (#4356)
Signed-off-by: Jan Bartel <janb@webtide.com>
2019-11-27 11:45:33 +11:00
olivier lamy 80da9e22db Merge branch 'jetty-9.4.x' into jetty-10.0.x 2019-11-27 10:09:37 +10:00
Joakim Erdfelt a7fbe7a6bb Updating to version 10.0.0-SNAPSHOT 2019-11-26 17:22:06 -06:00
Joakim Erdfelt 57e5cd8a4d Updating to version 10.0.0.alpha1 2019-11-26 16:44:13 -06:00
olivier lamy dc1a3384b0 ooops typo
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2019-11-27 07:18:59 +10:00