Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
23,198 Commits 72 Branches 465 Tags 369 MiB
Commit Graph

23198 Commits

Author SHA1 Message Date
Olivier Lamy 3c9de65b96
Issue #6098 jetty-cdi in jetty-bom (#6154) 
Signed-off-by: olivier lamy <oliver.lamy@gmail.com>
 2021-04-12 13:20:47 +10:00
Simone Bordet e163b001c3 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>
(cherry picked from commit aed20abcbe)
 2021-04-10 18:51:54 +02:00
Greg Wilkins b56edf511a
UriCompliance mode improvements #6132 (#6137) 
Resolve #6132

Improve configuration of ambiguous URI handling.
Added NON_CANONICAL_AMBIGUOUS_PATHS
 2021-04-08 12:03:30 +10:00
Lachlan Roberts 1cb10b8548 Remove unnecessary comment. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-08 09:28:28 +10:00
Lachlan Roberts f91334e6d7 Fix two disabled tests in TextStreamTest. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-07 20:54:43 +10:00
Lachlan Roberts 0d84f35b0d Issue #6106 - Decorate javax.websocket components during the websocket upgrade. 
Decoration should not be delayed until onOpen it should be during the call to
the WebSocketUpgradeFilter or WebSocketServlet.

Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-07 16:43:10 +10:00
Lachlan Roberts 02ef27246c Fix broken websocket tests. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-06 23:18:41 +10:00
Lachlan Roberts bda4c21bcb Issue #6106 - add testing for CDI with javax.websocket Encoder & Decoder 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-06 22:58:23 +10:00
Lachlan Roberts f858aa653c Issue #6106 - always decorate javax.websocket Configurators 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-06 22:39:15 +10:00
Lachlan Roberts a1e522755b Issue #6106 - Decorate javax.websocket Encoder & Decoders. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-04-06 16:09:15 +10:00
Guilherme Amaral e3c87fc2af
Changed exception check by JUnit API usage (#6133) 2021-04-06 08:51:50 +10:00
Joakim Erdfelt 25b96faa86
Merge pull request #6136 from eclipse/jetty-10.0.x-update-versiontxt-cves 
Update VERSION.txt
 2021-04-05 15:18:46 -05:00
Joakim Erdfelt 56f86d39f9
Update VERSION.txt 
+ Merge from jetty-9.4.x
+ Add CVE references
+ Remove testcase references

Signed-off-by: Joakim Erdfelt <joakim.erdfelt@gmail.com>
 2021-04-05 13:36:23 -05:00
Tony Thompson 46a76d955b
Exposed the configuration option to scan manifests on the JAR scanner. (#6097) 
* Exposed the configuration option to scan manifests on the JAR scanner.

Signed-off-by: Tony Thompson <tthompson1@lenovo.com>
 2021-04-02 17:50:12 +11:00
Lachlan Roberts ac5eb54e1e Issue #6106 - fix WebSocket/CDI integration 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-31 18:49:31 +11:00
Lachlan Roberts c29bad2301 Issue #6106 - add tests for WebSocket/CDI integration. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-31 18:36:15 +11:00
Lachlan d7de3ea660
Merge pull request #6092 from eclipse/jetty-10.0.x-6084-GzipHandlerCompressionPool 
Issue #6084 - CompressionPools should not be configured through the GzipHandler
 2021-03-31 11:08:52 +11:00
Lachlan 8a10cd1615
Merge pull request #6094 from eclipse/jetty-10.0.x-WebSocketServerComponents 
Do not store WebSocketComponents in Server scope.
 2021-03-31 10:55:36 +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
Lachlan Roberts 16b014c2fb Unmanage beans on WSSComponents if they are also beans on server. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-30 17:50:55 +11:00
Chris Walker 722f4ec2e3
Fix JDURL. Resolves #6110 2021-03-29 09:52:58 -05:00
Olivier Lamy a0796d1055 Updating to version 10.0.3-SNAPSHOT 2021-03-26 06:31:31 +00: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 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 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 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
Lachlan Roberts b51e40892d Fix lifecycle issues with WebSocketComponents and improve testing. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-26 00:07:57 +11:00
Lachlan Roberts 3ad772e5e7 Issue #6084 - Add setters for the Deflater/Inflater pool used by GzipHandler. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-25 20:24:24 +11: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
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 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 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
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 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
Lachlan Roberts b0a953a9fc Do not store WebSocketComponents in Server scope. 
Signed-off-by: Lachlan Roberts <lachlan@webtide.com>
 2021-03-24 17:15:09 +11: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