Add :woo-no-ssl to disable SSL feature and omit a dependency on CL+SSL.

Author: fukamachi

src/ev/socket.lisp

@@ -185,11 +185,15 @@
     (cffi:with-pointer-to-vector-data (data-sap data)
       (let* ((len (length data))
              (completedp nil)
-             (n (if (socket-ssl-handle socket)
-                    (cl+ssl::ssl-write (socket-ssl-handle socket)
-                                       data-sap
-                                       len)
-                    (wsys:write fd data-sap len))))
+             (n
+               #+woo-no-ssl
+               (wsys:write fd data-sap len)
+               #-woo-no-ssl
+               (if (socket-ssl-handle socket)
+                   (cl+ssl::ssl-write (socket-ssl-handle socket)
+                                      data-sap
+                                      len)
+                   (wsys:write fd data-sap len))))
         (declare (type fixnum len)
                  (type fixnum n))
         (case n

src/ev/tcp.lisp

@@ -100,6 +100,9 @@
          (ssl-handle (socket-ssl-handle socket)))
     (loop
       (let ((n
+              #+woo-no-ssl
+              (wsys:read fd (static-vectors:static-vector-pointer *input-buffer*) buffer-len)
+              #-woo-no-ssl
               (if ssl-handle
                   (cl+ssl::ssl-read ssl-handle (static-vectors:static-vector-pointer *input-buffer*) buffer-len)
                   (wsys:read fd (static-vectors:static-vector-pointer *input-buffer*) buffer-len))))

src/woo.lisp

@@ -20,6 +20,8 @@
                 :socket-remote-addr
                 :socket-remote-port
                 :with-sockaddr)
+  #-woo-no-ssl
+  (:import-from :woo.ssl)
   (:import-from :woo.util
                 :integer-string-p)
   (:import-from :quri
@@ -82,6 +84,7 @@
         (*listener* nil)
         (ssl (or ssl-key-file ssl-cert-file)))
     (labels ((start-socket (socket)
+               #-woo-no-ssl
                (when ssl
                  (woo.ssl:init-ssl-handle socket
                                           ssl-cert-file
@@ -130,17 +133,21 @@
                                                 :sockopt wsock:+SO-REUSEADDR+)))
                      (wev:close-tcp-server *listener*))))))
       (when ssl
-        (cl+ssl::ensure-initialized)
-        (when ssl-key-file
-          (setf ssl-key-file
-                (uiop:native-namestring
-                 (or (probe-file ssl-key-file)
-                     (error "SSL private key file '~A' does not exist." ssl-key-file)))))
-        (when ssl-cert-file
-          (setf ssl-cert-file
-                (uiop:native-namestring
-                 (or (probe-file ssl-cert-file)
-                     (error "SSL certificate '~A' does not exist." ssl-cert-file))))))
+        #+woo-no-ssl
+        (warn "SSL certificate is specified but Woo's SSL feature is off. Ignored.")
+        #-woo-no-ssl
+        (progn
+          (cl+ssl::ensure-initialized)
+          (when ssl-key-file
+            (setf ssl-key-file
+                  (uiop:native-namestring
+                   (or (probe-file ssl-key-file)
+                       (error "SSL private key file '~A' does not exist." ssl-key-file)))))
+          (when ssl-cert-file
+            (setf ssl-cert-file
+                  (uiop:native-namestring
+                   (or (probe-file ssl-cert-file)
+                       (error "SSL certificate '~A' does not exist." ssl-cert-file)))))))
       (if worker-num
           (start-multithread-server)
           (start-singlethread-server)))))

woo.asd

@@ -17,11 +17,11 @@
                "trivial-mimes"
                "vom"
                "alexandria"
-               #+sbcl "sb-posix"
-               #+(and linux (not asdf3)) "uiop"
-               #+sbcl "sb-concurrency"
-               #-sbcl "cl-speedy-queue"
-               "cl+ssl")
+               (:feature :sbcl "sb-posix")
+               (:feature (:and :linux (:not :asdf3)) "uiop")
+               (:feature :sbcl "sb-concurrency")
+               (:feature (:not :sbcl) "cl-speedy-queue")
+               (:feature (:not :woo-no-ssl) "cl+ssl"))
   :components ((:module "src"
                 :components
                 ((:file "woo" :depends-on ("ev" "response" "worker" "ssl" "signal" "specials" "util"))
@@ -38,7 +38,9 @@
                    (:file "tcp" :depends-on ("event-loop" "socket" "util" "condition"))
                    (:file "condition")
                    (:file "util")))
-                 (:file "ssl" :depends-on ("ev-packages"))
+                 (:file "ssl"
+                  :depends-on ("ev-packages")
+                  :if-feature (:not :woo-no-ssl))
                  (:module "llsocket"
                   :depends-on ("syscall")
                   :serial t