Commit Graph

23433 Commits

Author SHA1 Message Date
Simone Bordet e04e226adc Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:51:27 +01: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 7f0bc550f8 Merged branch 'jetty-10.0.x' into 'jetty-11.0.x'.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:12:30 +01:00
Simone Bordet bd030c7d13 Reverted VERSION.txt changes for dropped release.
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 16:09:53 +01: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
Simone Bordet e068119bc3 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 15:53:03 +01:00
Simone Bordet 43562774a8 Issue #6085 Fix duplicate valid session cookies to pick first valid.
Signed-off-by: Jan Bartel <janb@webtide.com>
Signed-off-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-25 15:53:03 +01:00
Olivier Lamy 30633a4389 releasing 10 need dot now
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
2021-03-25 06:22:04 +00: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
olivier lamy 6eadb8901f Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-03-25 09:27:18 +10:00
Joakim Erdfelt 8ab7a8f742 Issue #6063 - expose hazelcast.version (#6064)
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-25 09:26:38 +10:00
Greg Wilkins cd191e4d78 disable test on windows
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-25 10:16:26 +11:00
Jan Bartel f3d4bfa3e0 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-25 10:08:11 +11:00
Jan Bartel fd05a3d19c
Issue #6085 Fix reference counts for multiple valid cookies for sessions (#6088) (#6096)
* Issue #6085 Fix reference counts for multiple valid cookies for sesssions

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-25 09:37:17 +11:00
Greg Wilkins be9e1d3a57 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-25 07:44:56 +11:00
Greg Wilkins c1ae922ab0
Use Files.isSameFile to check Resource equality (#6093) (#6095)
Use Files.isSameFile to check Resource equality
Avoid using canonical and instead use Files.isSameFile

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Ludovic Orban <lorban@bitronix.be>
2021-03-24 21:44:27 +01:00
Greg Wilkins 303e031235
Added before dependents to Modules (#6080)
Added `before` section to a module to control ordering
rename `options` section to `after`

Signed-off-by: Greg Wilkins <gregw@webtide.com>
Co-authored-by: Simone Bordet <simone.bordet@gmail.com>
2021-03-24 13:31:36 +01:00
olivier lamy 6776b05615 fix checkstyle
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 17:22:25 +10:00
Greg Wilkins 54023f5a5b
Improve WebAppProvider scanning (#6090)
* Cherry pick from jetty-9

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.
2021-03-24 08:19:07 +01:00
olivier lamy 36bef3ec6e Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-03-24 16:44:23 +10:00
olivier lamy c6752b3522 do not use hardcoded port
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 16:38:22 +10:00
olivier lamy e8c7aacb08 run this test using testcontainers only if docker is available
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 16:34:40 +10:00
Greg Wilkins d80c622b00
Merge pull request from GHSA-v7ff-8wcx-gmc5 (#6089)
Always normalize ambiguous URIs

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-24 05:54:06 +01:00
Olivier Lamy d9db52f1d7
add an easy way to configure useInputDirectByteBuffers/useOutputDirectByteBuffers for HttpConfiguration (#6055)
* add an easy way to configure useInputDirectByteBuffers/useOutputDirectByteBuffers for HttpConfiguration

Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
2021-03-24 14:17:04 +10:00
Joakim Erdfelt cba4864fef
Issue #5996 - Remove logback-access.mod (#6002)
* Issue #5996 - Removing logback-access.mod

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-24 03:21:45 +01:00
Greg Wilkins 0d91f33b79
Fix #6076 Protect from null local certificates (#6078)
Fix #6076 Protect from null local certificates
cache resulting X509 in session

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-23 22:17:40 +01: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
Greg Wilkins 916f4614e6 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x
Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-22 21:32:45 +11:00
Greg Wilkins c59de808f1
Fix #5835 Durable filters and servlets (#6027)
Fix #5835 Durable filters and servlets with a general ServletHandler cleanup
update indexes after updating mapping
update mappings/indexes before destroyed listeners

Signed-off-by: Greg Wilkins <gregw@webtide.com>
2021-03-22 11:28:25 +01:00
Lachlan Roberts ade88d18cd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-19 17:16:01 +11:00
Lachlan cc81b309f3
Merge pull request #6069 from eclipse/jetty-10.0.x-6050-WebSocket-NotUft8Exception
Issue #6050 - Bring PermessageDeflateBufferTest to Jetty 10.
2021-03-19 17:15:22 +11:00
Lachlan Roberts 05e1283f4f Fix licence header.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:52:09 +11:00
Lachlan Roberts 41ca662155 Issue #6050 - Use 'decompressed' instead of 'read' as variable name.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:45:19 +11:00
Lachlan Roberts 4e0a42cceb Issue #6050 - Bring PermessageDeflateBufferTest to Jetty 10.
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-17 21:35:06 +11:00
Joakim Erdfelt 42cb89c680
Merge pull request #6062 from eclipse/jetty-10.0.x-update-versiontxt
Adding 9.4.38 release to VERSION.txt
2021-03-15 12:02:55 -05:00
Joakim Erdfelt 315f45d623
Adding 9.4.38 release to VERSION.txt
Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
2021-03-15 12:02:05 -05:00
Lachlan Roberts 7b59b96cbd Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-11 15:33:22 +11:00
Lachlan c664d673e0
Merge pull request #6033 from eclipse/jetty-10.0.x-6008-RequestLogFix
Issue #6008 - fix RequestLog usage with filePath.
2021-03-11 15:28:20 +11:00
Joakim Erdfelt 4e41d8d3e9
Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-10 06:24:53 -06:00
Joakim Erdfelt 1df86522d8
Merge pull request #6030 from eclipse/jetty-10.0.x-6028-root-getcontextpath
Issue #6028 - Request.getContextPath() for root context should be empty string (Jetty 10)
2021-03-10 06:23:04 -06:00
Lachlan Roberts 671a76c613 Issue #6008 - add default ini line for jetty.requestlog.dir
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
2021-03-10 21:37:30 +11:00
Olivier Lamy 06ea681032 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:17:21 +10:00
Jan Bartel db633450ad Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-10 10:12:10 +01:00
Jan Bartel 56864bd43d
Issue #6020 Fix redeploy error jetty-maven-plugin (#6023)
* Issue #6020 Fix redeploy error jetty-maven-plugin

Signed-off-by: Jan Bartel <janb@webtide.com>
2021-03-10 10:11:34 +01:00