Skip to content

Commit 0ccdca1

Browse files
committed
Update Jetty to 12.1.8 and fix fragile websocket test by duplicating ByteBuffer. Fixes #550.
1 parent 0a36f21 commit 0ccdca1

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

ring-jetty-adapter/project.clj

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,17 @@
88
[[org.clojure/clojure "1.9.0"]
99
[ring/ring-core "1.15.3"]
1010
[org.ring-clojure/ring-jakarta-servlet "1.15.3"]
11-
[org.eclipse.jetty/jetty-server "12.1.0"]
12-
[org.eclipse.jetty/jetty-unixdomain-server "12.1.0"]
13-
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.0"]
14-
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server "12.1.0"]]
11+
[org.eclipse.jetty/jetty-server "12.1.8"]
12+
[org.eclipse.jetty/jetty-unixdomain-server "12.1.8"]
13+
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.1.8"]
14+
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server "12.1.8"]]
1515
:aliases {"test-all" ["with-profile" "default:+1.10:+1.11:+1.12" "test"]}
1616
:profiles
1717
{:dev {:dependencies [[clj-http "3.13.1"]
1818
[less-awful-ssl "1.0.7"]
1919
[hato "1.0.0"]]
2020
:jvm-opts ["-Dorg.eclipse.jetty.server.HttpChannelState.DEFAULT_TIMEOUT=500"]}
21-
:test {:dependencies [[org.eclipse.jetty/jetty-client "12.1.0"]]}
21+
:test {:dependencies [[org.eclipse.jetty/jetty-client "12.1.8"]]}
2222
:1.10 {:dependencies [[org.clojure/clojure "1.10.3"]]}
2323
:1.11 {:dependencies [[org.clojure/clojure "1.11.4"]]}
2424
:1.12 {:dependencies [[org.clojure/clojure "1.12.1"]]}}

ring-jetty-adapter/test/ring/adapter/test/jetty.clj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -816,8 +816,8 @@
816816
(on-close [_ _ _ _])
817817
wsp/PingListener
818818
(on-ping [_ sock data]
819-
(ws/pong sock data)
820-
(swap! log conj [:ping (buf->str data)])))})]
819+
(swap! log conj [:ping (buf->str (.duplicate data))])
820+
(ws/pong sock data)))})]
821821
(with-server handler {:port test-port}
822822
(let [ws @(hato/websocket test-websocket-url
823823
{:on-pong

0 commit comments

Comments
 (0)