summaryrefslogtreecommitdiff
path: root/compojure-3.2/src
diff options
context:
space:
mode:
authorScott Ostler <scottbot9000@gmail.com>2010-06-16 01:12:29 -0400
committerScott Ostler <scottbot9000@gmail.com>2010-06-16 01:12:29 -0400
commit4e205df9bdb7768bf8dd83d9856b52e2ea0d4094 (patch)
tree115b9b44b068a6b700544e77489abd3b405b3424 /compojure-3.2/src
parent456ccfb658de5617ca0b5f1dc9094e4bef6e0bd4 (diff)
Update jetty to 6.1.24, add nio support to compojure
Diffstat (limited to 'compojure-3.2/src')
-rwxr-xr-xcompojure-3.2/src/compojure/server/jetty.clj5
1 files changed, 4 insertions, 1 deletions
diff --git a/compojure-3.2/src/compojure/server/jetty.clj b/compojure-3.2/src/compojure/server/jetty.clj
index f69d94c..140047a 100755
--- a/compojure-3.2/src/compojure/server/jetty.clj
+++ b/compojure-3.2/src/compojure/server/jetty.clj
@@ -13,6 +13,7 @@
(:import org.mortbay.jetty.Server
[org.mortbay.jetty.servlet Context ServletHolder]
org.mortbay.jetty.bio.SocketConnector
+ org.mortbay.jetty.nio.SelectChannelConnector
org.mortbay.jetty.security.SslSocketConnector))
(defn servlet-holder
@@ -68,7 +69,9 @@
(defn- create-server
"Construct a Jetty Server instance."
[options servlets]
- (let [connector (doto (SocketConnector.)
+ (let [connector (doto (if (options :nio)
+ (SelectChannelConnector.)
+ (SocketConnector.))
(.setPort (options :port 80))
(.setHost (options :host)))
server (doto (Server.)