Update Jetty to 12.1.8 (fixes #550)#552
Conversation
|
Looks like 12.1.8 breaks custom on-ping websocket events for some reason. |
|
The issue appears to be a fragile test. Duplicating the ByteBuffer fixes it: diff --git a/ring-jetty-adapter/test/ring/adapter/test/jetty.clj b/ring-jetty-adapter/test/ring/adapter/test/jetty.clj
index 106df91..2c68114 100644
--- a/ring-jetty-adapter/test/ring/adapter/test/jetty.clj
+++ b/ring-jetty-adapter/test/ring/adapter/test/jetty.clj
@@ -816,8 +816,8 @@
(on-close [_ _ _ _])
wsp/PingListener
(on-ping [_ sock data]
- (ws/pong sock data)
- (swap! log conj [:ping (buf->str data)])))})]
+ (swap! log conj [:ping (buf->str (.duplicate data))])
+ (ws/pong sock data)))})]
(with-server handler {:port test-port}
(let [ws @(hato/websocket test-websocket-url
{:on-pong |
|
Updated the PR. Both Thanks for providing the fix for the test. |
|
Looks good! Can you squash down your commits into one? You can use your original commit message. |
|
Squashing done! PS: And sorry for creating extra work for you regarding the additionally required fixes for this version bump (and in the other PR). |
No worries, that's what reviews are for. |
|
Can you change the commit message to: This makes the explanation a little clearer and adds a note about which issue was fixed. |
|
Done! |
|
Looks like you're missing the subject line of the commit message - that's the first line. |
Update Jetty to 12.1.8 and fix fragile websocket test by duplicating ByteBuffer. Fixes ring-clojure#550.
Fixed. This was a misunderstanding of what you wrote in #552 (comment) (I thought you wanted the only the second line as the entire commit message, because the first line was the original commit's message). |
This PR updates Jetty to
12.1.8to address two CVEs.CVEs:
Details
Related issues: