Revision: 4619 Author: edi URL: http://bknr.net/trac/changeset/4619

:drakma-no-ssl

U trunk/thirdparty/drakma/CHANGELOG.txt U trunk/thirdparty/drakma/doc/index.html U trunk/thirdparty/drakma/drakma.asd U trunk/thirdparty/drakma/util.lisp

Modified: trunk/thirdparty/drakma/CHANGELOG.txt =================================================================== --- trunk/thirdparty/drakma/CHANGELOG.txt 2010-10-12 21:43:51 UTC (rev 4618) +++ trunk/thirdparty/drakma/CHANGELOG.txt 2010-10-12 21:48:22 UTC (rev 4619) @@ -1,4 +1,5 @@ Don't funcall symbols that aren't FBOUNDP (Faré Rideau) +Allowed disabling of SSL when building (Marko Kocic)

Version 1.2.3 2010-08-05

Modified: trunk/thirdparty/drakma/doc/index.html =================================================================== --- trunk/thirdparty/drakma/doc/index.html 2010-10-12 21:43:51 UTC (rev 4618) +++ trunk/thirdparty/drakma/doc/index.html 2010-10-12 21:48:22 UTC (rev 4619) @@ -680,7 +680,8 @@ have <a href="http://www.lispworks.com/documentation/lw50/LWUG/html/lwuser-344.htm">the corresponding C libraries</a> as well. You'll usually have them -already unless you're on Windows. +already unless you're on Windows. If you don't have required C libraries you can add <b>:drakma-no-ssl</b> +to <b>*features*</b> to avoid using CL+SSL for https support. <p> The current development version of Drakma can be found at <a href="http://bknr.net/trac/browser/trunk/thirdparty">http://bknr.net/trac/browser/trunk/thirdparty</a>.

Modified: trunk/thirdparty/drakma/drakma.asd =================================================================== --- trunk/thirdparty/drakma/drakma.asd 2010-10-12 21:43:51 UTC (rev 4618) +++ trunk/thirdparty/drakma/drakma.asd 2010-10-12 21:48:22 UTC (rev 4619) @@ -59,4 +59,4 @@ :chunga :flexi-streams #-:lispworks :usocket - #-(or :lispworks :allegro) :cl+ssl)) + #-(or :lispworks :allegro :drakma-no-ssl) :cl+ssl))

Modified: trunk/thirdparty/drakma/util.lisp =================================================================== --- trunk/thirdparty/drakma/util.lisp 2010-10-12 21:43:51 UTC (rev 4618) +++ trunk/thirdparty/drakma/util.lisp 2010-10-12 21:48:22 UTC (rev 4619) @@ -330,10 +330,12 @@ (defun make-ssl-stream (http-stream) "Attaches SSL to the stream HTTP-STREAM and returns the SSL stream (which will not be equal to HTTP-STREAM)." - #+:allegro + #+(and :allegro (not :drakma-no-ssl)) (socket:make-ssl-client-stream http-stream) - #-:allegro + #+(and (not :allegro) (not :drakma-no-ssl)) (let ((s http-stream)) (cl+ssl:make-ssl-client-stream (cl+ssl:stream-fd s) - :close-callback (lambda () (close s))))) \ No newline at end of file + :close-callback (lambda () (close s)))) + #+:drakma-no-ssl + (error "SSL not supported. Remove :drakma-no-ssl from *features* to enable SSL"))