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

Apply LW6 patches from Nico

U trunk/thirdparty/hunchentoot/CHANGELOG U trunk/thirdparty/hunchentoot/lispworks.lisp

Modified: trunk/thirdparty/hunchentoot/CHANGELOG =================================================================== --- trunk/thirdparty/hunchentoot/CHANGELOG 2009-10-08 19:56:54 UTC (rev 4457) +++ trunk/thirdparty/hunchentoot/CHANGELOG 2009-10-14 21:45:48 UTC (rev 4458) @@ -1,3 +1,5 @@ +Prepare for LispWorks 6 (Nico de Jager) +Fix reading of post parameters (Peter Seibel) Fix STOP by supplying the :READY-ONLY keyword to USOCKET:WAIT-FOR-INPUT Enable SSL key passwords for Lisps other than LW (Vsevolod)

Modified: trunk/thirdparty/hunchentoot/lispworks.lisp =================================================================== --- trunk/thirdparty/hunchentoot/lispworks.lisp 2009-10-08 19:56:54 UTC (rev 4457) +++ trunk/thirdparty/hunchentoot/lispworks.lisp 2009-10-14 21:45:48 UTC (rev 4458) @@ -90,14 +90,14 @@ (defun make-socket-stream (socket acceptor) "Returns a stream for the socket SOCKET. The ACCEPTOR argument is used to set the timeouts." - #-:lispworks5 + #-(or :lispworks5 :lispworks6) (when (acceptor-write-timeout acceptor) (parameter-error "You need LispWorks 5 or higher for write timeouts.")) (make-instance 'comm:socket-stream :socket socket :direction :io :read-timeout (acceptor-read-timeout acceptor) - #+:lispworks5 #+:lispworks5 + #+(or :lispworks5 :lispworks6) #+(or :lispworks5 :lispworks6) :write-timeout (acceptor-write-timeout acceptor) :element-type 'octet))