Commit Graph

17781 Commits

Author SHA1 Message Date
Simone Bordet 692d901129
Merge pull request #4446 from eclipse/jetty-9.4.x-4444-tls_idle_timeout
Fixes #4444 -  Connection timeout intermittently when using jetty 9.4…
2020-01-17 10:10:34 +01:00
Simone Bordet fd52ff697e Merged branch 'jetty-9.4.x' into 'jetty-9.4.x-4444-tls_idle_timeout'. 2020-01-17 09:58:10 +01:00
Lachlan Roberts 08b1be6ea8 Issue #4475 - improve testing for MessageInputStream
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:47 +11:00
Lachlan Roberts 3d309a5797 Issue #4475 - use state machine for MessageInputStream
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 18:37:20 +11:00
Lachlan Roberts 3fd7094c01 Issue #4475 - suspend/resume to control reading frames while streaming
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-17 13:11:48 +11:00
Joakim Erdfelt 19e91a6a40
Issue #4483 - Cleanup of InetAddressSetTest (#4484)
* More resiliency on bad DNS servers

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-16 14:05:11 -06:00
Simone Bordet 6d65799bad Fixes #4481 - Fix NeedWantClientAuthTest for OpenJDK 13.0.2/11.0.6.
Updated the keystores to PKCS12 and added the Basic Constraint CA:true
to the server certificate.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-16 15:20:34 +01:00
Joakim Erdfelt b75cf1c6a6
Merge pull request #4479 from eclipse/jetty-9.4.x-4383-npe-multipart
Issue #4383 - Minimal NPE prevention on MultiPart
2020-01-15 16:40:03 -06:00
Joakim Erdfelt eba24b6b83
Issue #4383 - Updates behavior to eliminate ISE
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 15:48:51 -06:00
Joakim Erdfelt 37f8503442
Issue #4383 - Minimal NPE prevention on MultiPart
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 15:31:43 -06:00
Joakim Erdfelt 33a5a257aa
Updates from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 11:32:04 -06:00
Joakim Erdfelt d701065c20
Skipping pmd/checkstyle on javadoc stage
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 08:38:49 -06:00
Joakim Erdfelt 33ed4713eb
Moving maven threading to individual stages.
+ Javadoc stage is sensitive to multi-threaded execution

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-15 08:37:25 -06:00
Joakim Erdfelt aecc9a4af6
Bumping up javadoc stage timeout to 40 minutes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 16:56:06 -06:00
Joakim Erdfelt 0d9605823a
Restoring unicode testcase
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 16:05:55 -06:00
Joakim Erdfelt 1c00006ca7
Checkstyle now mandatory on build
+ Removed checkstyle suppressions
+ Force scan on source directories (main and test)
+ Excluding generated / filtered / copied sources
+ Removed Jenkins job for checkstyle

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 14:47:16 -06:00
Joakim Erdfelt 988b11d2bc
Fixing checkstyle violations
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 14:43:06 -06:00
Joakim Erdfelt 8c65309963
Addressing Checkstyle violations in src/test/java
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-01-14 12:33:34 -06:00
Lachlan Roberts c7b6ccca98 Issue #4475 - add tests not reading until EOF
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 19:14:48 +11:00
Lachlan Roberts 16c406b55c Issue #4475 - add test for fragmented frames
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 15:15:56 +11:00
Lachlan Roberts 26d12b9c2d Issue #4475 - proof of concept
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 14:52:50 +11:00
Lachlan Roberts a7b9df96fd cleanup WebSocket logging in EventSocket
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 10:33:19 +11:00
Lachlan e1f19be353
Closes #2620 - guard against exceptions for WebSocket onClose and onError (#4346)
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-01-14 09:22:56 +11:00
Greg Wilkins 96f6f2bb8d
Fix #4461 HttpOutput Aggregation (#4466)
* Issue #4461 HttpOutput Aggregation

Added tests to check that aggregation continues after first flush of an aggregated buffer (this triggers both #4461 and the discovered bug of not aggregating because of empty at capacity aggregate buffer).

Added getAggregateSize method that does a compact to avoid empty at capacity aggregate buffer

Call onWriteComplete if residue of an overflow aggregation can itself be aggregated.

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

* Issue #4461 HttpOutput Aggregation

Removed implicit compact from GzipHandler

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

* Issue #4461 HttpOutput Aggregation

Improve test coverage

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

* Issue #4461 HttpOutput Aggregation

Remove case that can never happen.

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

* Issue #4461 HttpOutput Aggregation

updates from review

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-10 07:20:54 +11:00
Simone Bordet 69808d3851
Merge pull request #4454 from JLLeitschuh/patch-1
Use HTTPS instead of HTTP to download SNAPSHOT Deps
2020-01-07 17:23:57 +01:00
Simone Bordet 923ec38adf Merged branch 'jetty-9.3.x' into 'jetty-9.4.x'. 2020-01-07 16:51:25 +01:00
Simone Bordet e3c8546667 Merged branch 'jetty-9.2.x' into 'jetty-9.3.x'. 2020-01-07 16:35:05 +01:00
Simone Bordet de890bb1b7 Happy New Year 2020.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 16:25:32 +01:00
Simone Bordet aed5a4458c Added forgotten @Deprecated annotation to deprecated method.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-01-07 15:40:46 +01:00
Jonathan Leitschuh 46140ed097 HTTPS instead of HTTP to download SNAPSHOT Deps
Signed-off-by: Jonathan Leitschuh <Jonathan.Leitschuh@gmail.com>
2020-01-04 11:45:43 -05:00
Greg Wilkins 0d4e07ea1e fix OpenIdAuthenticationTest for windows build
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2020-01-04 13:31:06 +11:00
Joakim Erdfelt f4e7e4c3db Merge branch 'release-9.4.25' into jetty-9.4.x 2020-01-03 12:49:27 -06:00
olivier lamy e1371a1c13 happy new year
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-01-02 21:54:05 +01:00
Simone Bordet 7663758643 Fixes #4445 - typo Limiting Load in jetty docs.
Fixed typo.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-30 21:17:59 +01:00
Simone Bordet d5e962e7d0 Fixes #4444 - Connection timeout intermittently when using jetty 9.4.25.
Fixed write in doShutdownOutput() by updating the state before the write,
so that needsFillInterest() can check whether to also do a write or not.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-30 17:18:49 +01:00
Simone Bordet 5794584aea Fixes #4444 - Connection timeout intermittently when using jetty 9.4.25.
Fixed handling of encrypted bytes to write in
needsFillInterest() when the TLS handshake status
is NOT_HANDSHAKING.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-26 18:57:00 +01:00
Joakim Erdfelt 8974176c4b Updating to version 9.4.26-SNAPSHOT 2019-12-20 11:30:41 -06:00
Joakim Erdfelt a9729c7e7f Updating to version 9.4.25.v20191220 2019-12-20 10:46:56 -06:00
Joakim Erdfelt ccf04a47cd
Merge pull request #4375 from eclipse/jetty-9.4.x_small_improvment_jdbc
avoid non necessary objects allocation if session do not have any attributes data
2019-12-20 10:29:01 -06:00
Joakim Erdfelt cef67d9a6c
Merge pull request #4423 from eclipse/jetty-9.4.x-3730-websocket-scope-cleanup
Issue #3730 - Cleaning up Scopes in WebSocketClient
2019-12-19 16:10:16 -06:00
Simone Bordet af7cb94528
Merge pull request #4428 from eclipse/jetty-9.4.x-4427-httpclient_retried_request_duplicates_cookies
Fixes #4427 - Retried request duplicates cookies.
2019-12-19 22:00:15 +01:00
Joakim Erdfelt d1d8f9a779
Merge pull request #4438 from jglick/patch-1
Reduce log level of message
2019-12-19 14:59:57 -06:00
Jesse Glick bc338e7c88
Reduce log level of message
Signed-off-by: Jesse Glick <jglick@cloudbees.com>
2019-12-19 15:43:19 -05:00
Joakim Erdfelt c2c2c56a02
Issue #3730 - EventDriverFactory and SessionFactory setters
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-19 13:46:12 -06:00
Joakim Erdfelt 26fde02c55
Issue #3730 - Updating invalid test assertion
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-19 12:43:49 -06:00
Joakim Erdfelt 94988596a1
Issue #3730 - Further updates from PR Review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-19 12:33:43 -06:00
Simone Bordet 26b0445a9e Fixed visibility of Scanner.Visitor.
Must be package private because it uses TimeNSize
in method signatures, that is also package private.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-19 11:53:20 +01:00
Simone Bordet e4f1106f09 Fixes #4421 - HttpClient support for PROXY protocol.
Fixed visibility of ProxyProtocolConnection.
Must be protected because it's the return type
of protected methods.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2019-12-19 10:11:54 +01:00
Greg Wilkins c5acf96506
Jetty 9.4.x 4331 async close complete3 (#4409)
* 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 #4331 Async Write Complete

Test harness to reproduce unready when closing/completing.

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

* Issue #4331 Async Write Complete

test both PENDING and UNREADY

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

* Issue #4331 Async Write Complete

test cleanups

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

* Issue #4331 Async Close Complete

Cleanups of write

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

* WIP

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

* Issue #4331 Close Complete

Work in progress

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

* Issue #4331 Close Complete

Added async close to HttpWriter and ResponseWriter
Always use async close, with blocker if necessary.

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

* Issue #4331 Close Complete

Working async close complete!

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

* Issue #4331 Close Complete

invert test as we can now call complete when not ready!

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

* Issue #4331 Close Complete

fixed transition to ERROR state

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

* Issue #4331 Close Complete

async close after onError

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

* Issue #4331 Close Complete

minor cleanups

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

* Issue #4331 Close Complete

Fix for proxy tests

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

* Issue #4331 Close Complete

Fix write loop to handle clear of p=0,l=0 rather than p=l

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

* Issue #4331 Close Complete

Removed old close on all content mechanism
Cleanups and some more TODOs

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

* Issue #4331 Close Complete

a reworking of HttpOutput to separate out API state.

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

* Issue #4331 Close Complete

Soft close for Dispatcher
release buffer in onWriteComplete

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

* Issue #4331 Close Complete

Set _onError in onWriteComplete
NOOP callback instead of null

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

* Issue #4331 Close Complete

failure closes HttpOutput

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

* Issue #4331 Close Complete

Moved closedCallback handling to onWriteComplete

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

* Issue #4331 Close Complete

Additional test of complete during blocking write.

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

* Issue #4331 Close Complete

reimplemented blocking close to sometimes be async

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

* Issue #4331 Close Complete

ascii "art"

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

* Issue #4331 Close Complete

Code cleanup.  Use a CLOSE state rather than non null closedCallback to be clearer that it is a state.
Renamed close(Callback) to complete(Callback)
Renamed and simplified closed() to completed()

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

* Issue #4331 Close Complete

Do not dispatch
Better ascii art
improved close impl to be similar to complete

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

* Issue #4331 Close Complete

More test cases

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

* Issue #4331 Close Complete

retain execute behaviour in 9.4. review in 10.

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

* Improved javadoc and ascii art

* Improved CLOSING

Switch to CLOSING state as soon as last write is done, even if several non last channelWrites will be done.   This allows a subsequent call to close to know that nothing needs to be written and can avoid some EOF exceptions. Now onWriteComplete acts only on the passed in last parameter.

Added test for sendContent

* WIP

Aggregate within lock
pipeline test debug

* Avoid creating ignored exception when Idle or Failed.

* Try a parse without fill to avoid unconsumed input debug

* fixed pipeline size

* release buffer before callback

* turn off debug

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

* Issue #4331 Close Complete

Better javadoc
refactored onWriteComplete logic to be simpler
fixed bug with flush of last written byte

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

* Issue #4331 Close Complete

Completely reworked test harness for better coverage.

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

* Issue #4331 Close Complete

Reworked order of ifs to match logic above in onWriteComplete

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2019-12-19 12:17:11 +11:00
Joakim Erdfelt bb79f3e6e0
Issue #3730 - Collapsing now redundant private Constructor
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2019-12-18 15:33:23 -06:00