Permalink
Browse files

Revert "Added :trust-all? option to run-jetty"

The Jetty 7 API docs are not always accurate about what a function does.
The setTrustAll method only applies when there is no keystore or
truststore, rendering it useless for client certificates.

This reverts commit 00bb43e.
  • Loading branch information...
1 parent 00bb43e commit be3475f2726e0af8d1c1a1e18970e7343852a2f7 @weavejester weavejester committed Mar 1, 2012
Showing with 2 additions and 4 deletions.
  1. +2 −4 ring-jetty-adapter/src/ring/adapter/jetty.clj
View
6 ring-jetty-adapter/src/ring/adapter/jetty.clj
@@ -26,7 +26,6 @@
(let [context (SslContextFactory.)]
(.setKeyStorePath context (options :keystore))
(.setKeyStorePassword context (options :key-password))
- (.setTrustAll context (boolean (options :trust-all?)))
(when (options :truststore)
(.setTruststore context (options :truststore)))
(when (options :trust-password)
@@ -72,9 +71,8 @@
:truststore - a truststore to use for SSL connections
:trust-password - the password to the truststore
:max-threads - the maximum number of threads to use (default 250)
- :client-auth - SSL client certificate authentication; may be set to :need,
- :want or :none (defaults to :none)
- :trust-all? - set to true to accept all client certificates"
+ :client-auth - SSL client certificate authenticate, may be set to :need,
+ :want or :none (defaults to :none)"
[handler options]
(let [^Server s (create-server (dissoc options :configurator))]
(when-let [configurator (:configurator options)]

0 comments on commit be3475f

Please sign in to comment.