18799 Commits

Author SHA1 Message Date
Joakim Erdfelt
19a1b0c74f
Issue #6148 - introduce jetty.build to show git sha for build
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-04-09 16:52:40 -05:00
Joakim Erdfelt
871560032e
Issue #6148 - update jetty.tag.version behavior
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-04-08 13:50:20 -05:00
Simone Bordet
aed20abcbe
Fixes #6105 - HttpConnection.getBytesIn() incorrect for requests with… (#6108)
* Fixes #6105 - HttpConnection.getBytesIn() incorrect for requests with chunked content

Moved recording of bytes to fillRequestBuffer(),
so they are accounted also for async reads.
Added test case.
Fixed test that was too strictly comparing HttpConnection.bytesIn,
that now report a correct, but larger value.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-04-08 12:19:17 +02:00
Greg Wilkins
58538c90b5 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>
(cherry picked from commit 96f707f74b93fa19b1eb8a99fe7f3794da6617fe)
2021-04-07 09:21:58 +02:00
Lachlan
941d7fb369
Improve testing for temp directories (#5483)
Improve testing around WebAppContext temporary directories.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
Co-authored-by: olivier lamy <oliver.lamy@gmail.com>
2021-04-06 10:29:08 +10:00
Joakim Erdfelt
45c6599bc7
Merge pull request #6134 from eclipse/jetty-9.4.x-version-cve-update
Update VERSION.txt
2021-04-05 13:32:00 -05:00
Joakim Erdfelt
3a86b0c430
Update VERSION.txt
+ Add CVE references
+ Remove reference to fixing testcases

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-04-05 12:14:40 -05:00
Jesse McConnell
c50bed4e65
#6110 fix JDURL and plugin declaration. (#6111) 2021-03-29 09:35:03 -05:00
Jesse McConnell
d23925809d
Updating to version 9.4.40-SNAPSHOT 2021-03-25 10:06:56 -05:00
Jesse McConnell
9fc7ca5a92
update VERSION.txt jetty-9.4.39.v20210325 2021-03-25 09:36:22 -05:00
Jesse McConnell
ee95f92d70
Updating to version 9.4.39.v20210325 2021-03-25 09:33:14 -05:00
Jesse McConnell
0992dbd35f
reset Version.txt 2021-03-25 09:20:02 -05:00
Jesse McConnell
65c2da3de3
reset build-resources version 2021-03-25 09:14:45 -05:00
Jesse McConnell
7dacf1503f
reset release to 9.4.39-SNAPSHOT 2021-03-25 09:03:35 -05:00
Jesse McConnell
be786489a8
reset release to 9.4.39-SNAPSHOT 2021-03-25 08:52:25 -05:00
Simone Bordet
f6afdc5b01 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Fixed typo and stopping server & client in testMulitpleIdenticalSessionCookies().

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 13:09:32 +01:00
Simone Bordet
64006c61c6 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Cosmetic changes.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 13:09:32 +01:00
Jan Bartel
af042ba297 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-25 13:09:32 +01:00
Olivier Lamy
e0111e581a Updating to version 9.4.40-SNAPSHOT 2021-03-25 03:39:19 +00:00
Olivier Lamy
e56edccd03 Updating to version 9.4.39.v20210325 2021-03-25 03:20:25 +00:00
Joakim Erdfelt
1154f2ee4f
Issue #6063 - expose hazelcast.version (#6064)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-25 09:23:50 +10:00
Greg Wilkins
cb4b4d853d disable test on windows
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-25 09:37:23 +11:00
Greg Wilkins
ebe8311333
Use Files.isSameFile to check Resource equality (#6093)
Use Files.isSameFile to check Resource equality
Avoid using canonical and instead use Files.isSameFile

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-24 12:54:21 +01:00
olivier lamy
63810134c7 do not use hardcoded port
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 16:33:04 +10:00
olivier lamy
d295aa6d63 run this test using testcontainers only if docker is available
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 16:33:04 +10:00
Jan Bartel
6d8ae9cafe
Issue #6085 Fix reference counts for multiple valid cookies for sessions (#6088)
* Issue #6085 Fix reference counts for multiple valid cookies for sesssions

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-24 13:31:36 +11:00
Joakim Erdfelt
37fffb1722
Merge pull request from GHSA-j6qj-j888-vvgq
Ensure that WebAppProvider Filter always canonicalises the file passed in from the Scanner. Thus, both the monitored directory is canonical as well as the file it is being compared against.

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

Co-authored-by: Greg Wilkins <gregw@webtide.com>
2021-03-24 01:18:40 +01:00
Greg Wilkins
e412c8a15b
Merge pull request from GHSA-v7ff-8wcx-gmc5
Always normalize ambiguous URIs

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-24 01:10:28 +01:00
Simone Bordet
294b2ba02b 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:37 +01:00
Joakim Erdfelt
00d379c94b 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:37 +01:00
Lachlan
6b341908cc
Merge pull request #6056 from eclipse/jetty-9.4.x-6050-WebSocket-NotUft8Exception
Issue #6050 - fix bug for permessage deflate buffer aggregation
2021-03-17 21:36:02 +11:00
Lachlan Roberts
2c5ab59c9d Issue #6050 - use compressed and decompressed as variable names
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 19:03:10 +11:00
Joakim Erdfelt
f92394e748
Merge pull request #6053 from eclipse/jetty-9.4.x-client-hybrid-smaller
Issue #6052 - make ModuleLocation optional on Android
2021-03-15 11:58:51 -05:00
Joakim Erdfelt
9e29832a8a
Issue #6052 - Applying changes from review
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-15 09:22:04 -05:00
Joakim Erdfelt
a3a1478c91
Issue #6052 - Removing MethodHandle from TypeUtil static initializer
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-15 09:05:25 -05:00
Lachlan Roberts
2f2b6ba8be Issue #6050 - add comment and change variable name to clarify
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-11 11:49:38 +11:00
Joakim Erdfelt
d7982f869b
Issue #6052 - make ModuleLocation optional on Android
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-10 10:45:29 -06:00
Lachlan Roberts
c8dd4cdaeb Issue #6050 - fix bug for permessage deflate buffer aggregation
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-10 21:30:43 +11:00
Olivier Lamy
b899261497
fix some mod files: some url using http to https, use maven central if possible, upgrade log4j2 to 2.14.0 (#6048)
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-10 19:12:47 +10:00
Simone Bordet
132f4b9ab1 Fixes #6034 - SslContextFactory may select a wildcard certificate during SNI selection when a more specific SSL certificate is present.
Now matching certificates are sorted, non-wildcard first, so that a more specific alias is returned.

Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-09 09:55:44 +01:00
Joakim Erdfelt
367cd7b4c6
Adding CVE-2020-27223 reference to VERSION.txt
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-04 09:15:32 -06:00
Joakim Erdfelt
03f7a0cbc0
Merge remote-tracking branch 'origin/release-9.4.38' into jetty-9.4.x 2021-03-04 09:12:26 -06:00
Jan Bartel
01ee48cda3
Issue #6004 Add redirect for configure_9_3.dtd to XmlParserTest (#6015)
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-02-27 14:37:36 +01:00
gregw
88a69b8f67 updated CVE
Signed-off-by: gregw <gregw@webtide.com>
2021-02-27 09:23:41 +01:00
Chris Walker
6e6574e92d Update Version.txt with CVEs (#6014)
Adds CVEs to Version.txt
2021-02-25 15:59:18 -06:00
Joakim Erdfelt
5fed958e08 Updating to version 9.4.39-SNAPSHOT 2021-02-24 14:52:43 -06:00
Joakim Erdfelt
288f3cc745 Updating to version 9.4.38.v20210224 jetty-9.4.38.v20210224 2021-02-24 14:16:09 -06:00
Joakim Erdfelt
0603b1337b
Merge pull request #6005 from eclipse/jetty-9.4.x-6001-default-accept-ambiguous-uris
Fix #6001 separate compliance modes for ambiguous URI segments, params and separators
2021-02-24 14:12:05 -06:00
Joakim Erdfelt
e68293ef4e
Addressing copy/paste mistakes
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-02-24 12:47:48 -06:00
gregw
f9b5974ded Fix #4275 separate compliance modes for ambiguous URI segments and separators
default modes allows both ambiguous separators and segments, but still forbids ambiguous parameters
2021-02-24 19:17:49 +01:00