Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,452 Commits 69 Branches 462 Tags 354 MiB
Commit Graph

23452 Commits

Author SHA1 Message Date
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
Chris Walker d30281be7e
Fixing JDURL per #6110 2021-03-29 09:57:11 -05:00
Chris Walker b0e825fe1a
Merge branch 'jetty-10.0.x' into jetty-11.0.x 2021-03-29 09:56:10 -05:00
Chris Walker 722f4ec2e3
Fix JDURL. Resolves #6110 2021-03-29 09:52:58 -05: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
Olivier Lamy 2d360b1c2c Reverted VERSION.txt changes for dropped release. 
Signed-off-by: Olivier Lamy <oliver.lamy@gmail.com>
 2021-03-26 06:05:22 +00:00
Lachlan Roberts 03f6a318c7 Merge remote-tracking branch 'origin/jetty-10.0.x' into jetty-11.0.x 2021-03-26 16:20:47 +11:00
Lachlan b68a5fec2f
Merge pull request #6107 from eclipse/jetty-10.0.x-JavaxWebSocketContainerProvider 
Make the JavaxWebSocketClientContainer.getContainer(HttpClient) method static.
 2021-03-26 16:18:34 +11:00
Lachlan Roberts 47ec9b1a7e Modify SecureClientContainerExample to use the new getContainer(HttpClient) method. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-26 14:55:32 +11:00
Lachlan Roberts a86a0c2662 Add static utility methods on container to add and remove beans. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-26 11:11:45 +11:00
Lachlan Roberts 57779c6026 Make the HttpClient getContainer method static on JavaxWebSocketClientContainerProvider. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-26 11:11:18 +11: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
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