Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: jetty 12.0.4 #120

Merged
merged 1 commit into from
Dec 8, 2023
Merged

feat: jetty 12.0.4 #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion http3/project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(def jetty-version "12.0.3")
(def jetty-version "12.0.4")

(defproject info.sunng/ring-jetty9-adapter-http3 "0.4.2"
:description "Ring adapter for jetty 9 and above, meta package for http3"
Expand Down
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
(def jetty-version "12.0.3")
(def jetty-version "12.0.4")

(defproject info.sunng/ring-jetty9-adapter "0.30.3-SNAPSHOT"
:description "Ring adapter for jetty9, which supports websocket and spdy"
Expand Down
5 changes: 3 additions & 2 deletions src/ring/adapter/jetty9/common.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
(:import [org.eclipse.jetty.http HttpHeader HttpField MimeTypes MimeTypes$Type]
[org.eclipse.jetty.server.handler BufferedResponseHandler]
[org.eclipse.jetty.server Request Response SecureRequestCustomizer]
[org.eclipse.jetty.io Content$Sink]
[org.eclipse.jetty.io Content$Sink EndPoint$SslSessionData]
[org.eclipse.jetty.http ImmutableHttpFields HttpFields$Mutable HttpURI]
[java.util Locale]))

Expand Down Expand Up @@ -50,7 +50,8 @@
(MimeTypes/getCharsetFromContentType content-type))))

(defn- get-client-cert [^Request request]
(.getAttribute request SecureRequestCustomizer/PEER_CERTIFICATES_ATTRIBUTE))
(when-let [session-data (.getAttribute request EndPoint$SslSessionData/ATTRIBUTE)]
(.peerCertificates ^EndPoint$SslSessionData session-data)))

(defn build-request-map
"Create the request map from the Request object."
Expand Down