Skip to content

Commit 8fcd3b6

Browse files
committed
Update Jetty to 12.1.0
Update Jetty with workaround for jetty/jetty.project#13502
1 parent e6d4a1b commit 8fcd3b6

File tree

3 files changed

+15
-6
lines changed

3 files changed

+15
-6
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.0-beta1"]
1010
[org.ring-clojure/ring-jakarta-servlet "1.15.0-beta1"]
11-
[org.eclipse.jetty/jetty-server "12.0.21"]
12-
[org.eclipse.jetty/jetty-unixdomain-server "12.0.21"]
13-
[org.eclipse.jetty.ee9/jetty-ee9-servlet "12.0.21"]
14-
[org.eclipse.jetty.ee9.websocket/jetty-ee9-websocket-jetty-server "12.0.21"]]
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"]]
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.0.21"]]}
21+
:test {:dependencies [[org.eclipse.jetty/jetty-client "12.1.0"]]}
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/src/ring/adapter/jetty.clj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,13 +142,22 @@
142142
(onError [_ _])
143143
(onStartAsync [_ _])))
144144

145+
(def ^:private empty-listener
146+
(reify AsyncListener
147+
(onTimeout [_ _])
148+
(onComplete [_ _])
149+
(onError [_ _])
150+
(onStartAsync [_ _])))
151+
145152
(defn- async-proxy-handler ^ServletHandler
146153
[handler {:keys [async-timeout async-timeout-handler]
147154
:or {async-timeout 0}
148155
:as options}]
149156
(proxy [ServletHandler] []
150157
(doHandle [_ ^Request base-request ^HttpServletRequest request response]
151158
(let [^AsyncContext context (.startAsync request)]
159+
;; Workaround for https://github.com/jetty/jetty.project/issues/13502
160+
(.addListener context empty-listener)
152161
(.setTimeout context async-timeout)
153162
(when async-timeout-handler
154163
(.addListener context

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -362,7 +362,7 @@
362362
(is (= (:content-length request-map) 5))
363363
(is (= (:character-encoding request-map) "UTF-8"))
364364
(is (= (:request-method request-map) :post))
365-
(is (= (:content-type request-map) "text/plain; charset=UTF-8"))
365+
(is (= (:content-type request-map) "text/plain; charset=utf-8"))
366366
(is (= (:remote-addr request-map) "127.0.0.1"))
367367
(is (= (:scheme request-map) :http))
368368
(is (= (:server-name request-map) "localhost"))

0 commit comments

Comments
 (0)