Skip to content

Commit

Permalink
Merge pull request #74 from criesbeck/cl-express-ssl
Browse files Browse the repository at this point in the history
fixes #73
  • Loading branch information
hanshuebner authored Aug 28, 2016
2 parents c5e01e2 + fb6186f commit c81a0f2
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drakma.asd
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
:cl-ppcre
#-:drakma-no-chipz :chipz
#-:lispworks :usocket
#-(or :lispworks :allegro :mocl-ssl :drakma-no-ssl) :cl+ssl)
#-(or :lispworks (and :allegro (not :allegro-cl-express)) :mocl-ssl :drakma-no-ssl) :cl+ssl)
:perform (test-op (o s)
(asdf:load-system :drakma-test)
(asdf:perform 'asdf:test-op :drakma-test)))
4 changes: 2 additions & 2 deletions util.lisp
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ which are not meant as separators."
(when (and ca-file
(not (probe-file ca-file)))
(error "ca file ~A not found" ca-file))
#+(and :allegro (not :drakma-no-ssl))
#+(and :allegro (not :allegro-cl-express) (not :drakma-no-ssl))
(socket:make-ssl-client-stream http-stream
:certificate certificate
:key key
Expand All @@ -325,7 +325,7 @@ which are not meant as separators."
(when (or ca-file ca-directory)
(warn ":max-depth, :ca-file and :ca-directory arguments not available on this platform"))
(rt:start-ssl http-stream :verify verify))
#+(and (not :allegro) (not :mocl-ssl) (not :drakma-no-ssl))
#+(and (or :allegro-cl-express (not :allegro)) (not :mocl-ssl) (not :drakma-no-ssl))
(let ((s http-stream)
(ctx (cl+ssl:make-context :verify-depth max-depth
:verify-mode (if (eql verify :required)
Expand Down

0 comments on commit c81a0f2

Please sign in to comment.