Commit Graph

2340 Commits

Author SHA1 Message Date
Joakim Erdfelt 9d2d1e29b7 Updating to version 10.0.6-SNAPSHOT 2021-06-11 09:42:42 -05:00
Joakim Erdfelt dc21b2d73c Updating to version 10.0.5 2021-06-11 09:18:00 -05:00
Ludovic Orban 61a30e381d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-06-10 15:49:43 +02:00
Ludovic Orban 33c1b14ada #6379: requeue at the tail to reduce contention + use a simpler concurrent queue implementation
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2021-06-10 15:45:11 +02:00
Joakim Erdfelt 063e8c80d5 Updating to version 11.0.5-SNAPSHOT 2021-06-04 13:53:06 -05:00
Joakim Erdfelt 5bcdeb52ae Updating to version 11.0.4 2021-06-04 13:35:11 -05:00
Joakim Erdfelt 987066aac1 Updating to version 10.0.5-SNAPSHOT 2021-06-04 13:28:47 -05:00
Joakim Erdfelt 5523480c54 Updating to version 10.0.4 2021-06-04 13:09:44 -05:00
Simone Bordet eee4a1a4fe Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-04 12:48:44 +02:00
Simone Bordet 21aba4a724 Fixes #6323 - HttpClient requests with redirects gets stuck/never calls onComplete()
* Reworked the total timeout handling.
* Now a CyclicTimeouts handles the exchanges in each HttpDestination,
and a CyclicTimeouts handles the exchanges in each HttpConnection
(rather than in HttpChannel).
* Now adjusting the total timeout for copied requests generated by
redirects and authentication.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 2e7d17400f)
2021-06-04 12:12:40 +02:00
Simone Bordet d5f753b3d0 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-06-03 15:18:08 +02:00
Simone Bordet c151b04535 Fixes #5931 - SslConnection should implement getBytesIn()/getBytesOut(). (#6335)
Updated ConnectionStatistics to report both the stats of all connections,
and the stats grouped by connection class.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit f902d12fe8)
2021-06-03 15:16:12 +02:00
Simone Bordet a83bff553c Updated POM versions to 11.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:16:21 +02:00
Simone Bordet 9ace21992e Updated POM versions to 10.0.4-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-21 17:07:46 +02:00
Simone Bordet 462aff39bc Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-20 09:42:36 +02:00
Simone Bordet 67e2b4af2f
Fixes #5306 - Default jetty.*.acceptors should be 1. (#6236)
* Fixes #5306 - Default jetty.*.acceptors should be 1.

Changed the acceptor default to 1, with -1 calculating a value based on the number of cores.
Updated documentation.
Fixed a glitch in ManagedSelector.getMaxSelectedKeys() to return long, not double.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-20 09:34:07 +02:00
Simone Bordet 8871e076fa Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-16 20:48:34 +02:00
Simone Bordet 27db8ed65b
Fixes #6251 - Use CyclicTimeout for HTTP2Streams. (#6267)
* Fixes #6251 - Use CyclicTimeout for HTTP2Streams.

Introduced CyclicTimeouts to manage many entities that may timeout.
Rewritten HttpDestination request timeouts using CyclicTimeouts.
HTTP2Stream does not inherit from IdleTimeout anymore; now a
CyclicTimeouts in HTTP2Session manages the stream timeouts.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-16 20:37:33 +02:00
Simone Bordet e9a8497521 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-05-12 17:22:40 +02:00
Simone Bordet de2d764290 Fixes #6254 - Total timeout not enforced for queued requests.
Fixed logic in HttpDestination.RequestTimeouts, where now a timeout
is scheduled only when the expiration time is less than the existing one.
Various code cleanups.
Renamed HttpDestination.TimeoutTask to RequestTimeouts for clarity.
Improved javadocs, code comments and logging.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
(cherry picked from commit 5f23689aa7)
(cherry picked from commit da50e06b64)
(cherry picked from commit 88ac10439a)
2021-05-12 10:19:11 +02:00
Lachlan Roberts 1d953e72ba Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-04-19 11:14:19 +10:00
Lachlan 4c98990cd9
Create FileBufferedResponseHandler to buffer responses into a file. (#6010)
FileBufferedResponseHandler adds an HttpOutput.Interceptor to buffer all responses into a file until the output is closed. This allows the commit to be delayed until the response is complete and thus headers and response status can be changed while writing the body.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-04-19 11:02:44 +10:00
Greg Wilkins f727812721 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-31 07:27:19 +11:00
Greg Wilkins 20fae6485c
Jetty 10.0.x #5684 disabled tests (#6081)
* Fixes for #5684
Simplified CyclicTimeoutTest#testBusy
InclusiveByteRange clears range list on errors
InclusiveByteRange is forgiving of tab separators and leading 0s

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-30 22:24:56 +02:00
Olivier Lamy 3ee2ba7172 Updating to version 11.0.3-SNAPSHOT 2021-03-26 06:58:38 +00:00
Olivier Lamy 14ed9a5264 Updating to version 11.0.2 2021-03-26 06:41:47 +00:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00:00
olivier lamy 61b5e1a8af revert back to 11.0.2-SNAPSHOT
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-26 16:15:49 +10:00
Olivier Lamy 7bd207b309 Updating to version 10.0.2 2021-03-26 06:13:42 +00:00
Olivier Lamy d27363fa55 back to 10.0.2-SNAPSHOT
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-26 06:10:47 +00:00
Jesse McConnell e1f2f8c989
Updating to version 11.0.3-SNAPSHOT 2021-03-25 11:14:04 -05:00
Jesse McConnell 0a126e2e21
Updating to version 11.0.2 2021-03-25 10:58:33 -05:00
Jesse McConnell 7a9e01ac56
Updating to version 10.0.3-SNAPSHOT 2021-03-25 10:38:15 -05:00
Jesse McConnell aac6bfbd48
Updating to version 10.0.2 2021-03-25 10:21:44 -05:00
Simone Bordet 6fca106160 Reverted version to 10.0.2-SNAPSHOT.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:02:45 +01:00
Olivier Lamy 3d0574d64c Updating to version 10.0.3-SNAPSHOT 2021-03-25 04:10:39 +00:00
Olivier Lamy ab235ad687 Updating to version 10.0.2 2021-03-25 03:57:25 +00:00
Greg Wilkins eea4a6fa6a Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-24 08:07:04 +11:00
Greg Wilkins 96f707f74b
Fix #6082 Reduce SSL buffer compaction (#6083)
Fix #6082 Reduce SSL buffer compaction
Only compact when buffer is underflown.  Note that BufferUtil will also do a cheap "compact" when flipping empty buffers.

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-23 22:04:27 +01:00
Simone Bordet 43104e2077 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-22 23:34:08 +01:00
Simone Bordet 039c7386d0 Fixes #6072 - jetty server high CPU when client send data length > 17408.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-22 23:24:57 +01:00
Joakim Erdfelt be22761a20 Fixes #6072 - jetty server high CPU when client send data length > 17408.
Avoid spinning if the input buffer is full.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-22 23:24:57 +01:00
Joakim Erdfelt 3f0f57cefc Updating to version 11.0.2-SNAPSHOT 2021-02-19 16:20:48 -06:00
Joakim Erdfelt e98092c179 Updating to version 11.0.1 2021-02-19 16:02:24 -06:00
Joakim Erdfelt 8ed8dc62e3 Updating to version 10.0.2-SNAPSHOT 2021-02-19 13:06:42 -06:00
Joakim Erdfelt d0bfd9145d Updating to version 10.0.1 2021-02-19 12:43:50 -06:00
Simone Bordet 9b28a4a5c9 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-17 19:20:23 +01:00
Simone Bordet 938d7d8e88 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-17 19:15:09 +01:00
Simone Bordet 25d90380c7 Fixes #5973 - Proxy client TLS authentication example.
Examples, in form of test cases for a proxy that uses TLS client authentication
both towards the remote client and towards the server.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-17 14:48:47 +01:00
Simone Bordet 5e587d4860 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 16:09:19 +01:00
Simone Bordet 0ccaa9f87b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-02-03 15:25:09 +01:00
Simone Bordet 755ec458d5 Fixes #5787 - Make ManagedSelector report better JMX data.
Added SampleStatistics to record data and JMX methods to export it.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-01-22 19:14:31 +01:00
Joakim Erdfelt 10136235b2
Happy New Year 2021 (Jetty 11 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:22:28 -06:00
Joakim Erdfelt e81c847998
Happy New Year 2021 (Jetty 10 edition)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 15:05:57 -06:00
Joakim Erdfelt 176e29e408
Happy New Year 2021
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-01-21 12:31:00 -06:00
Joakim Erdfelt 2e53ec5384 Updating to version 9.4.37-SNAPSHOT 2021-01-14 11:27:24 -06:00
Joakim Erdfelt 238ec6997c Updating to version 9.4.36.v20210114 2021-01-14 10:29:28 -06:00
Lachlan Roberts 6ab9b97dab Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-28 16:36:27 +11:00
Lachlan Roberts e340227066 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-12-28 16:27:29 +11:00
Lachlan 3d11d4e071
Merge pull request #5789 from eclipse/jetty-9.4.x-5783-ConnectionStatisticsRates
Fix the calculation of rates in ConnectionStatistics
2020-12-28 16:26:55 +11:00
Lachlan Roberts 4e9e9b8d19 Remove the total count from the RateCounter.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-21 15:55:54 +11:00
Lachlan Roberts 87cee078ce Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-15 21:00:15 +11:00
Lachlan Roberts 477a6c0a10 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-15 20:58:33 +11:00
Lachlan Roberts 41cffa0bc4 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-15 16:49:23 +11:00
Joakim Erdfelt d5b08ea9f2
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-12-11 11:40:10 -06:00
Joakim Erdfelt 2662be0a05
Merge pull request #5795 from eclipse/jetty-10.0.x-5784-fix-dual-license-text
Issue #5784 - fix dual license text
2020-12-11 11:37:58 -06:00
olivier lamy 5aee03b9d0 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 16:54:44 +10:00
olivier lamy 37c040ebab use setOpaque/getOpaque i.e fixing merge
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 16:54:23 +10:00
olivier lamy efe4f5e5ea Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-12-11 12:11:53 +10:00
olivier lamy 9b100a5bfb Merge branch 'jetty-9.4.x' into jetty-10.0.x 2020-12-11 12:10:35 +10:00
Olivier Lamy 639cad63fe
Jetty 9.4.x optimize parser warning from logs and add spotbug (#5735)
* enable spotbugs in CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

record issues

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

use warning new generation

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

activate errorprone

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix Jenkinsfile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

do not run spotbugs for jetty-runner as we do not want to fix all dependencies bugs :)

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit should allow empty results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

maven console can be use only once...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

one liner

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

recordissues only once

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

force id

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

aggregate results

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

configure a name for aggregated reports

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

mo more -T3 no need anymore of remote session test profile

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

I want to see what failing tests look like with new report.

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

skip spotbugs for jetty-jmh

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

get rid of findbugs as we now have spotbugs

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

Revert "I want to see what failing tests look like with new report."

This reverts commit df0d13e4c53d7461872e1f925ec06bd36e4a66c9.

activate errorProne parser

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

make pmd quiet for CI

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

remove -fae flag and do not display transfer progress

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

try junitParser() to see what it does

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

junit parser is a bad idea...

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

increase timeout

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

no -T2 for javadoc

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

fix skip spotbugs and pmd verbose

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>

* remove -T options

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-12-11 11:47:26 +10:00
Joakim Erdfelt f0badc5c5e
Issue #5784 - Fixing source header text: EPL-2.0 OR Apache-2.0
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-12-10 16:04:50 -06:00
Lachlan Roberts ffe3aa4459 Issue #5783 - fix getRate() methods on ConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-10 22:15:59 +11:00
Joakim Erdfelt d0572ada58
Merge remote-tracking branch 'origin/release-11.0.0' into jetty-11.0.x 2020-12-09 15:28:50 -06:00
Joakim Erdfelt 0a70fbf206
Merge remote-tracking branch 'origin/release-10.0.0' into jetty-10.0.x 2020-12-09 15:28:26 -06:00
Ludovic Orban ad68c4a9aa merge jetty-10.0.x into jetty-11.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-09 16:44:43 +01:00
Ludovic Orban c8ffa675dd merged jetty-9.4.x into jetty-10.0.x
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-12-09 16:40:57 +01:00
Ludovic Orban 415196520e fix race condition that may make the bucket cleaning pick the wrong one in case the timestamp is read while being modified 2020-12-09 16:33:29 +01:00
Joakim Erdfelt 30bd8b9fba Updating to version 11.0.1-SNAPSHOT 2020-12-02 15:59:13 -06:00
Joakim Erdfelt 432f896d7a Updating to version 11.0.0 2020-12-02 15:35:56 -06:00
Joakim Erdfelt 9319f10425 Updating to version 10.0.1-SNAPSHOT 2020-12-02 15:30:13 -06:00
Joakim Erdfelt b9645a1737 Updating to version 10.0.0 2020-12-02 15:04:53 -06:00
Lachlan Roberts 8aedc50048 fix missing usage of the new _direct field in ByteBufferAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-02 00:07:38 +11:00
Lachlan Roberts 6dce1cbffd Make ByteBufferAccumulator direct configurable
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 10:07:18 +11:00
Lachlan Roberts 602cd7e5c0 throw ArithmeticException on integer overflow from size
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-12-01 09:51:09 +11:00
Lachlan Roberts a51b5db209 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-12-01 09:45:45 +11:00
Simone Bordet 07c94abc4b Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-11-23 15:54:21 +01:00
Joakim Erdfelt e8683cba9f Updating to version 9.4.36-SNAPSHOT 2020-11-20 16:05:27 -06:00
Joakim Erdfelt bdc54f03a5 Updating to version 9.4.35.v20201120 2020-11-20 15:05:50 -06:00
Chris Walker 4071310044 Merge branch 'jetty-10.0.x' into jetty-11.0.x
# Conflicts:
#	tests/test-integration/src/test/java/org/eclipse/jetty/test/HttpInputIntegrationTest.java
2020-11-20 14:00:26 -06:00
Simone Bordet a2c0818811 Merged branch 'jetty-10.0.x' into 'jetty-10.0.x-5691-httpinput_skip_fill_interest'. 2020-11-20 19:10:55 +01:00
Simone Bordet 428d60bc3c Javadocs fixes.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-20 19:02:50 +01:00
Simone Bordet 8edb5cfc24 Issue #5691 - HttpInput may skip setting fill interest.
Code cleanups and logging improvements.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-11-20 16:50:24 +01:00
Lachlan Roberts f63a741b0f use local length field for ByteAccumulator.getLength()
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 21:16:38 +11:00
Lachlan Roberts 7c46d96fce Issue #5499 - add tests for ByteBufferAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-17 17:11:47 +11:00
Lachlan Roberts 5788fe609d Fix ByteBufferAccumulator minSize
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 18:43:22 +11:00
Lachlan Roberts a1aa5dcd14 Issue #5499 - use ByteBufferAccumulator for websocket compression
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-16 18:33:38 +11:00
Lachlan Roberts e7bed39239 Issue #5499 - add javadoc for ByteBufferAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-13 09:56:32 +11:00
Lachlan Roberts e0031e0585 Issue #5499 - takeBuffer releases all the buffers in the list
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-13 09:22:57 +11:00
Lachlan Roberts d75e6de1b2 add takeByteBuffer method to ByteBufferOutputStream2
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-12 08:48:50 +11:00
Lachlan Roberts 595d4bfcc4 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-11 22:18:26 +11:00
Lachlan Roberts 8dc0d9932d adjust minimum space in ByteBufferAccumulator before buffer allocation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-06 18:52:11 +11:00
Lachlan Roberts 3c44df0724 changes from review
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-06 14:09:13 +11:00
Lachlan Roberts 7bcae9968b allow writing directly into the ByteAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 17:19:05 +11:00
Lachlan Roberts a3c3e24cab Use the ByteBufferPool in the ByteAccumulator
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 14:38:19 +11:00
Lachlan Roberts 145bcff649 Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-9.4.x-ByteAccumulator 2020-11-05 13:43:00 +11:00
Lachlan Roberts 05dafb89ab Move work on ByteAccumulator to jetty-util
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-11-05 13:42:47 +11:00
Joakim Erdfelt edaadff55b Updating to version 9.4.35-SNAPSHOT 2020-11-02 09:04:51 -06:00
Joakim Erdfelt e46af88704 Updating to version 9.4.34.v20201102 2020-11-02 08:03:51 -06:00
Joakim Erdfelt 5b31caf389
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-26 10:24:34 -05:00
Joakim Erdfelt 76a0f19a60
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-26 10:24:05 -05:00
Joakim Erdfelt 64d323fce1
Closes #5511 - Deleting old SslEngineBehaviorTest
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-26 09:06:03 -05:00
Joakim Erdfelt 0d03196a52
Dumping JVM details for when SslEngineBehaviorTest.checkSslEngineBehaviour fails
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-26 08:54:00 -05:00
Joakim Erdfelt e726eefb0b Updating to version 9.4.34-SNAPSHOT 2020-10-20 18:55:39 -05:00
Joakim Erdfelt 1be6875565 Updating to version 9.4.33.v20201020 2020-10-20 18:28:51 -05:00
Joakim Erdfelt 611c00d431
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-20 17:36:26 -05:00
Joakim Erdfelt 05f08fec4c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-20 17:35:56 -05:00
Joakim Erdfelt fa6c8f7dec
Issue #5480 - Only delete non-persist temp dir if not-empty
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-20 17:19:54 -05:00
Joakim Erdfelt 60fa27f12f
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-10-16 08:52:05 -05:00
Joakim Erdfelt e12c3ce50b
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-10-16 08:11:42 -05:00
Joakim Erdfelt fdd880b66b
Issue #5451 - Cleanup of temp file cleanup.
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-10-15 18:10:38 -05:00
Joakim Erdfelt c223ee37ab Updating to version 11.0.0-SNAPSHOT 2020-10-02 16:38:23 -05:00
Joakim Erdfelt 9ce21ec22b Updating to version 11.0.0.beta2 2020-10-02 16:20:55 -05:00
Joakim Erdfelt 85e257fc98 Updating to version 9.4.33-SNAPSHOT 2020-09-30 11:53:09 -05:00
Joakim Erdfelt de97d26f7b Updating to version 9.4.32.v20200930 2020-09-30 11:03:24 -05:00
Joakim Erdfelt 88f3dd5a52
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-09-29 11:37:46 -05:00
Joakim Erdfelt ad2446dd6c
Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-09-29 11:24:28 -05:00
Joakim Erdfelt 3423375a97
Issue #5357 - Updating to https://eclipse.org/ (#5358)
* Issue #5357 - Updating to https://eclipse.org/

 - Removing redundant <url> refs in pom.xml
 - Correcting bad indenting from merge
 - Correcting mailing list references
 - Correcting bugs.eclipse.org references
 - Correcting text file references
 - Correcting html references
 - Correcting further references
 - Correcting download.eclipse.org reference
 - Adding test for demo-base /proxy/current/
 - Ensuring jetty-client is included in javadoc-proxy.war/WEB-INF/lib

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-09-29 11:02:32 -05:00
Jan Bartel e47d2fb32b Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-24 17:20:56 +02:00
Jan Bartel 77779ed6d8
Issue #4996 - Regularlize logging (#5167)
* Issue #4996 Regularize logging

Signed-off-by: Jan Bartel <janb@webtide.com>

Co-authored-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-08-24 17:15:13 +02:00
Lachlan Roberts a87e88576d Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-08-19 09:25:21 +10:00
Lachlan Roberts 931e10458a Merge remote-tracking branch 'origin/jetty-9.4.x' into jetty-10.0.x 2020-08-19 08:34:39 +10:00
Lachlan cfd31b2cf5
Merge pull request #5125 from eclipse/jetty-9.4.x-5122-WebSocketStats
Issue #5122 - Improve connection statistics for WebSocket
2020-08-19 08:04:47 +10:00
Lachlan Roberts c37d902ef7 remove tri-state logic from IncludeExcludeConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-18 10:18:44 +10:00
olivier lamy 85a281f473 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-08-15 09:25:23 +08:00
Simone Bordet 7bc52f924a Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-08-14 18:34:46 +02:00
Lachlan Roberts 1663a6d7af Issue #5125 - Generalise WebSocketConnectionStatistics into IncludeExcludeConnectionStatistics
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-08-14 15:19:06 +10:00
Oleg Mozzhechkov 32fe19a5e0 #5150 - Code style fix and connect timeout docs update
Signed-off-by: Oleg Mozzhechkov <oleg.mozzhechkov@gmail.com>
2020-08-13 21:23:31 +03:00
Oleg Mozzhechkov bffd6a2c0f #5150 - Infinite connection timeout support in ManagedSelector
Signed-off-by: Oleg Mozzhechkov <oleg.mozzhechkov@gmail.com>
2020-08-13 17:36:16 +03:00
olivier lamy e26126264a Updating to version 11.0.0-SNAPSHOT 2020-08-11 16:48:06 +08:00
olivier lamy 6b2b429ba5 Updating to version 11.0.0.beta1 2020-08-11 16:48:06 +08:00
olivier lamy c198d26e6b Updating to version 10.0.0-SNAPSHOT 2020-08-11 16:47:55 +08:00
olivier lamy 429b091578 Updating to version 10.0.0.beta1 2020-08-11 16:47:54 +08:00
Simone Bordet e8f76878e3 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'. 2020-08-04 17:46:55 +02:00
Simone Bordet 089e51f0bc Fixes #5083 - Convert synchronized usages to AutoLock.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-29 15:34:01 +02:00
Simone Bordet 8d69fc41a7 Fixes #5083 - Convert synchronized usages to AutoLock.
* Replaced relevant usages of synchronized with AutoLock.
* Made AutoLock serializable since classes that use it may be stored in the HttpSession.
* Added convenience methods to AutoLock to execute lambdas with the lock held.
* Introduced AutoLock.WithCondition to use a Lock and a Condition together.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-27 23:14:05 +02:00
Joakim Erdfelt fe9deae849 Updating to version 9.4.32-SNAPSHOT 2020-07-23 13:53:47 -05:00
Joakim Erdfelt 450ba27947 Updating to version 9.4.31.v20200723 2020-07-23 12:46:54 -05:00
olivier lamy eefe3d202b revert fail release
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2020-07-10 15:04:22 +10:00
olivier lamy 9619a5a743 Updating to version 10.0.0.beta1 2020-07-10 14:23:28 +10:00
olivier lamy 6ff39cf848 Updating to version 11.0.0-SNAPSHOT 2020-07-10 06:25:08 +10:00
olivier lamy 4c250b0f93 Updating to version 11.0.0.beta1 2020-07-10 06:25:07 +10:00
olivier lamy 9fa6a5794c Updating to version 11.0.0-SNAPSHOT 2020-07-09 16:24:52 +10:00
olivier lamy 5353ec98e0 Updating to version 11.0.0.beta0 2020-07-09 14:32:48 +10:00
olivier lamy aaeffb719e Updating to version 10.0.0-SNAPSHOT 2020-07-09 12:25:34 +10:00
olivier lamy 23c99ffdbe Updating to version 10.0.0.beta1 2020-07-09 11:20:55 +10:00
Lachlan Roberts fb4f8ece54 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2020-07-07 18:19:38 +10:00
Simone Bordet ba6a6ea67d Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-06 23:10:19 +02:00
Simone Bordet f2c6b67827
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo(). (#5008)
Fixes #4971 - Simplify Connection.upgradeFrom()/upgradeTo().

Now the upgrade-from connection produces a "floating" buffer 
(not belonging to a pool), so that it can release the original buffer.

The upgrade-to connection is free to copy or store this "floating" buffer.

Strengthened ByteBufferPool behavior when releasing non-pooled
ByteBuffers: the buffer is now discarded.

Updated javadocs and all implementations.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-06 22:45:03 +02:00
Lachlan Roberts 5e1dd78379 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-07-06 12:42:20 +10:00
Simone Bordet 7d8e56bd10 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-07-03 16:46:23 +02:00
Simone Bordet ae43b70a9f
Jetty 9.4.x 4967 buffer corruption for http2 failures (#5001)
Fixes #4967 - Possible buffer corruption in HTTP/2 session failures

Partially reverted the changes introduced in #4855, because they
were working only when sends were synchronous.

Introduced ByteBufferPool.remove(ByteBuffer) to fix the issue.
Now when a concurrent failure happens while frames are being
generated or sent, the buffer is discarded instead of being
recycled, therefore resolving the buffer corruption.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-07-03 16:35:33 +02:00
Joakim Erdfelt 6df6fa33b8 Updating to version 9.4.31-SNAPSHOT 2020-06-11 08:24:34 -05:00
Joakim Erdfelt 271836e4c1 Updating to version 9.4.30.v20200611 2020-06-11 07:21:18 -05:00
olivier lamy fc77b3e199 Updating to version 10.0.0-SNAPSHOT 2020-05-30 19:41:49 +10:00
olivier lamy dddc4a58e4 Updating to version 11.0.0-alpha0 2020-05-30 13:27:25 +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
olivier lamy 7e37eb1a6b Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-05-11 13:49:39 +10:00
Ludovic Orban 1d424a304b Add setReuseAddress() to ClientConnector
Signed-off-by: Ludovic Orban <lorban@bitronix.be>
2020-05-08 17:54:01 +02:00
olivier lamy e677d7c6f0 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-05-07 11:06:39 +10:00
Simone Bordet 1c22de433b Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-05-04 19:11:26 +02:00
Simone Bordet 0a028b663b Issue #4798 - Better handling of fatal Selector failures.
More updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-30 10:55:29 +02:00
Simone Bordet 8c75eeccce Issue #4798 - Better handling of fatal Selector failures.
Updates after review.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-29 11:57:06 +02:00
Simone Bordet 952a20f81c Issue #4798 - Better handling of fatal Selector failures.
Implemented selector recovery by transferring
all keys to a newly created selector.

Updated code so that it does not assume that the
SelectionKey never changes.
2020-04-27 23:19:06 +02:00
Simone Bordet 46ad90598c Code cleanups. 2020-04-27 22:57:57 +02:00
olivier lamy 7e03bb250e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-04-10 18:46:25 +10:00
Joakim Erdfelt 5699b9ff3d Updating to version 9.4.29-SNAPSHOT 2020-04-08 13:15:04 -05:00
Joakim Erdfelt ab228fde9e Updating to version 9.4.28.v20200408 2020-04-08 12:33:56 -05:00
Simone Bordet e1be62c978 Merged branch 'jetty-9.4.x' into 'jetty-10.0.x'. 2020-04-07 14:54:09 +02:00
Simone Bordet 7ef05860ee Fixes #4751 - Refresh NetworkTraffic* classes.
Added missing license header.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-07 12:19:49 +02:00
Simone Bordet 4e3c0c8cd7 Fixes #4751 - Refresh NetworkTraffic* classes.
Introduced NetworkTrafficSocketChannelEndPoint to replace
NetworkTrafficSelectChannelEndPoint, now deprecated.

Code and javadocs cleanup.

Moved the tests to jetty-client so that also the client is tested.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-07 12:04:24 +02:00
olivier lamy 3483e0c2f7 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-04-07 11:39:31 +10:00
Simone Bordet 51c42f2849 Improvements to the Jetty client documentation, protocols section.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-04-03 15:48:54 +02:00
olivier lamy 0030d9ad08 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-04-01 12:10:09 +10:00
Simone Bordet 9a6ad8af62 Improvements to the Jetty client documentation.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-31 17:53:28 +02:00
olivier lamy 27e431ce41 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-03-21 15:05:42 +10: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 9492a5379c
Issue #4685 - eliminate <version> in jetty-slf4j-impl
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2020-03-20 10:42:36 -05: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 2bc8f361a6 Issue #4382 - Support HTTP/1 upgrade to HTTP/2 in HttpClient.
Updated after first review.
Added more tests, fixed the upgrade over TLS case.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2020-03-17 18:49:57 +01:00
olivier lamy f06c2b1774 Merge branch 'jetty-10.0.x' into jetty-11.0.x 2020-03-17 11:27:33 +10: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
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 25966a7108 update version to 11.0.0-SNAPSHOT
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2020-03-04 20:50:57 +11: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
Dmitry Kornilov ab94409574 ProxyConnectionFactory should not ignore TLVs
Signed-off-by: Dmitry Kornilov <dmitry.kornilov@oracle.com>
2020-02-19 15:07:49 +01:00