Menu
▾
▴
portableaserve-cvslog — Comments and diff for each CVS commit
You can subscribe to this list here.
| 2001 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(14) |
Sep
(2) |
Oct
(24) |
Nov
|
Dec
(3) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2002 |
Jan
(7) |
Feb
(19) |
Mar
(3) |
Apr
(24) |
May
(2) |
Jun
(35) |
Jul
(27) |
Aug
|
Sep
(8) |
Oct
(29) |
Nov
(38) |
Dec
(34) |
| 2003 |
Jan
(15) |
Feb
(3) |
Mar
(10) |
Apr
(47) |
May
(22) |
Jun
(22) |
Jul
(11) |
Aug
(31) |
Sep
(10) |
Oct
(2) |
Nov
(19) |
Dec
(34) |
| 2004 |
Jan
(42) |
Feb
(60) |
Mar
(20) |
Apr
(8) |
May
|
Jun
(9) |
Jul
(2) |
Aug
(21) |
Sep
(3) |
Oct
(2) |
Nov
|
Dec
|
| 2005 |
Jan
|
Feb
(11) |
Mar
(5) |
Apr
(1) |
May
|
Jun
|
Jul
(4) |
Aug
(4) |
Sep
|
Oct
(3) |
Nov
|
Dec
|
| 2006 |
Jan
(6) |
Feb
(1) |
Mar
|
Apr
(2) |
May
|
Jun
(2) |
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2007 |
Jan
|
Feb
(3) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2008 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(6) |
Sep
|
Oct
|
Nov
|
Dec
|
| 2010 |
Jan
|
Feb
(2) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
| 2012 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
(2) |
|
From: Rudi S. <ru...@us...> - 2012-12-03 16:09:44
|
Update of /cvsroot/portableaserve/portableaserve In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31980 Added Files: DO_NOT_USE_THIS_REPO Log Message: Summary: Mark repository unused Author: Rudi Schlatte --- NEW FILE --- THE CVS REPO FOR PORTABLEASERVE IS NOT ACTIVE ANYMORE The source (and version history) was transferred to git. See the project homepage for details. |
|
From: Rudi S. <ru...@us...> - 2012-12-03 16:08:01
|
Update of /cvsroot/portableaserve/portableaserve In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31812 Modified Files: README Log Message: Summary: Mark repository unused Author: Rudi Schlatte Index: README =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/README,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- README 31 Aug 2003 18:42:28 -0000 1.9 +++ README 3 Dec 2012 16:07:51 -0000 1.10 @@ -1,32 +1,4 @@ -README -- - -This is a short description of what you will find -in the subdirectories of this archive - - ./acl-compat/ Several ACL compatibility hacks - ./aserve/ The AServe source - ./debian/ Debian package files - ./contrib/ Additional useful (?) code contributed by users - ./logical-hostnames.lisp Some logical-pathname-translations needed by defsys - ./README This file - ./README.cmucl Additional documentation for CMU Common Lisp - ./INSTALL.lisp Quick installation - - The quick-installation script compiles and loads Portable AllegroServe. - - Loading the file aserve:example.cl and evaluating - (aserve-example::start-server :port 2001) starts an AllegroServe - server on http://localhost:2001 that shows off some of the things - possible with AllegroServe. Depending on the Lisp implementation, it - might be necessary to give additional arguments :chunking nil and/or - :listeners 0, since chunked transfer encoding and multi-threading are - not supported everywhere. - - -Regards, -Jochen Schmidt - --- -j...@da... -http://www.dataheaven.de +THE CVS REPO FOR PORTABLEASERVE IS NOT ACTIVE ANYMORE +The source (and version history) was transferred to git. See the +project homepage for details. |
|
From: Rudi S. <ru...@us...> - 2010-02-08 11:14:30
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24562/acl-compat Modified Files: packages.lisp Log Message: Apply "patch for recent(ish) sbcl" from Andras Simon Index: packages.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/packages.lisp,v retrieving revision 1.28 retrieving revision 1.29 diff -u -w -r1.28 -r1.29 --- packages.lisp 21 Jun 2006 08:06:47 -0000 1.28 +++ packages.lisp 8 Feb 2010 11:14:13 -0000 1.29 @@ -26,6 +26,7 @@ #+lispworks (:import-from :common-lisp #:fixnump) #+sbcl (:import-from :sb-int #:fixnump) #+sbcl (:import-from :sb-ext #:without-package-locks) + #+sbcl (:import-from :sb-ext #:string-to-octets) #+cmu (:import-from :ext #:without-package-locks) #+allegro (:shadowing-import-from :excl #:filesys-size #:filesys-write-date #:intern* #:filesys-type #:atomically #:fast) @@ -50,8 +51,8 @@ #+(or allegro lispworks mcl openmcl) #:run-shell-command #+(or allegro mcl openmcl) #:fasl-read #+(or allegro mcl openmcl) #:fasl-write - #+(or allegro cmu scl mcl lispworks openmcl) #:string-to-octets - #+(or allegro cmu scl mcl lispworks openmcl) #:write-vector + #+(or allegro cmu scl mcl lispworks openmcl sbcl) #:string-to-octets + #+(or allegro cmu scl mcl lispworks openmcl sbcl) #:write-vector )) |
|
From: Rudi S. <ru...@us...> - 2010-02-08 11:14:25
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat/sbcl In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv24562/acl-compat/sbcl Modified Files: acl-socket.lisp Log Message: Apply "patch for recent(ish) sbcl" from Andras Simon Index: acl-socket.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/sbcl/acl-socket.lisp,v retrieving revision 1.10 retrieving revision 1.11 diff -u -w -r1.10 -r1.11 --- acl-socket.lisp 25 Feb 2007 12:21:52 -0000 1.10 +++ acl-socket.lisp 8 Feb 2010 11:14:13 -0000 1.11 @@ -45,8 +45,7 @@ :input t :output t ;; :buffering :none :element-type - (element-type server-socket) - :auto-close t))) + (element-type server-socket)))) (if (eq (stream-type server-socket) :bivalent) ;; HACK: remember socket, so we can do peer lookup (make-bivalent-stream stream :plist `(:socket ,socket)) |
|
From: Kevin R. <kev...@us...> - 2008-08-15 00:34:56
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat/lispworks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21037/acl-compat/lispworks Modified Files: acl-socket.lisp Log Message: Patch from Lispworks Inc to add SSL support Index: acl-socket.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/lispworks/acl-socket.lisp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -r1.6 -r1.7 --- acl-socket.lisp 20 Oct 2005 07:54:06 -0000 1.6 +++ acl-socket.lisp 15 Aug 2008 00:35:05 -0000 1.7 @@ -308,4 +308,50 @@ :ssl-configure-callback #'ssl-configure-callback)) socket-stream) + +;; SSL support using built-in LispWorks OpenSSL interface + +(defvar *certificate-ctx-map* (make-hash-table :test 'equal)) +(defvar *certificate-ctx-map-lock* (mp:make-lock)) +(defvar *share-ssl-ctx-p* nil) ; needs to remain as NIL for ACL compatibility? + +(defun ensure-ssl-ctx-for-certificate (certificate-file + key + certificate-password) + (if *share-ssl-ctx-p* + (mp:with-lock (*certificate-ctx-map-lock*) + (or (gethash certificate-file *certificate-ctx-map*) + (setf (gethash certificate-file *certificate-ctx-map*) + (make-ssl-ctx-for-certificate certificate-file + key + certificate-password)))) + (make-ssl-ctx-for-certificate certificate-file + key + certificate-password))) + +(defun make-ssl-ctx-for-certificate (certificate-file + key + certificate-password) + (let ((ssl-ctx (comm:make-ssl-ctx :ssl-side :server))) + (when certificate-password + (comm:set-ssl-ctx-password-callback ssl-ctx :password certificate-password)) + (comm:ssl-ctx-use-certificate-chain-file ssl-ctx (namestring certificate-file)) + (comm:ssl-ctx-use-rsaprivatekey-file ssl-ctx + (namestring (or key certificate-file)) + comm:ssl_filetype_pem) + ;; (comm:set-ssl-ctx-dh ssl-ctx :filename dh-file) + ssl-ctx)) + +(defmethod make-ssl-server-stream ((stream comm:socket-stream) &key + certificate key certificate-password + ;; method verify max-depth ; client cert options + ;; ca-file ca-directory ; not implemented yet + ) + (let ((ctx (ensure-ssl-ctx-for-certificate certificate + key + certificate-password))) + (comm:attach-ssl stream :ssl-side :server :ssl-ctx ctx) + ;; Return the same stream -- is this allowed? + stream)) + (provide 'acl-socket) |
|
From: Kevin R. <kev...@us...> - 2008-08-15 00:34:56
|
Update of /cvsroot/portableaserve/portableaserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21037 Modified Files: INSTALL.lisp Log Message: Patch from Lispworks Inc to add SSL support Index: INSTALL.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/INSTALL.lisp,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -r1.17 -r1.18 --- INSTALL.lisp 10 Jun 2004 03:52:10 -0000 1.17 +++ INSTALL.lisp 15 Aug 2008 00:35:05 -0000 1.18 @@ -92,5 +92,10 @@ ;;; Start example server (in multiprocessing) on port 2001 (start-server :port 2001) +;; SSL server example +(start-server :port 2443 + :ssl (lispworks:example-file "ssl/cert-and-key.pem") + :ssl-password "123456") + ;MCL/OpenMCL note: chunking is not yet implemented so use (start-server :port 2001 :chunking nil) ||# |
|
From: Kevin R. <kev...@us...> - 2008-08-15 00:34:56
|
Update of /cvsroot/portableaserve/portableaserve/aserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21037/aserve Modified Files: main.cl Log Message: Patch from Lispworks Inc to add SSL support Index: main.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/main.cl,v retrieving revision 1.47 retrieving revision 1.48 diff -u -w -r1.47 -r1.48 --- main.cl 15 Aug 2008 00:30:14 -0000 1.47 +++ main.cl 15 Aug 2008 00:35:05 -0000 1.48 @@ -988,7 +988,7 @@ #+mswindows (declare (ignore setuid setgid)) #-(or (and allegro (version>= 6 2 beta)) - (and :lispworks4.4 (not :cl-ssl))) + (and :lispworks (not :cl-ssl))) (declare (ignore ssl-password)) (declare (ignore debug)) ; for now @@ -1016,9 +1016,9 @@ (funcall 'acl-compat.socket::make-ssl-server-stream socket :certificate ssl #+(or (and allegro (version>= 6 2 beta)) - (and :lispworks4.4 (not :cl-ssl))) :certificate-password + (and :lispworks (not :cl-ssl))) :certificate-password #+(or (and allegro (version>= 6 2 beta)) - (and :lispworks4.4 (not :cl-ssl))) ssl-password))) + (and :lispworks (not :cl-ssl))) ssl-password))) (setq chunking nil) ; doesn't work well through ssl (if* (not port-p) then ; ssl defaults to port 443 |
|
From: Kevin R. <kev...@us...> - 2008-08-15 00:30:06
|
Update of /cvsroot/portableaserve/portableaserve/aserve/htmlgen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19083/aserve/htmlgen Modified Files: htmlgen.cl Log Message: Patch from Lispworks Inc to remove duplicate code Index: htmlgen.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/htmlgen/htmlgen.cl,v retrieving revision 1.8 retrieving revision 1.9 diff -u -w -r1.8 -r1.9 --- htmlgen.cl 21 Jun 2006 08:06:47 -0000 1.8 +++ htmlgen.cl 15 Aug 2008 00:30:14 -0000 1.9 @@ -67,8 +67,6 @@ ;; html generation -(defvar *html-stream*) ; all output sent here - (defstruct (html-process (:type list) (:constructor make-html-process (key has-inverse macro special |
|
From: Kevin R. <kev...@us...> - 2008-08-15 00:30:06
|
Update of /cvsroot/portableaserve/portableaserve/aserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19083/aserve Modified Files: main.cl proxy.cl Log Message: Patch from Lispworks Inc to remove duplicate code Index: main.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/main.cl,v retrieving revision 1.46 retrieving revision 1.47 diff -u -w -r1.46 -r1.47 --- main.cl 19 Feb 2006 10:32:44 -0000 1.46 +++ main.cl 15 Aug 2008 00:30:14 -0000 1.47 @@ -267,8 +267,7 @@ ) ;; specials from other files -(defvar *header-block-sresource*) -(defvar *header-index-sresource*) +(declaim (special *header-block-sresource* *header-index-sresource*)) (defvar *header-keyword-array* ;; indexed by header-number, holds the keyword naming this header ) Index: proxy.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/proxy.cl,v retrieving revision 1.17 retrieving revision 1.18 diff -u -w -r1.17 -r1.18 --- proxy.cl 21 Jan 2006 16:51:44 -0000 1.17 +++ proxy.cl 15 Aug 2008 00:30:14 -0000 1.18 @@ -2650,20 +2650,6 @@ (defmethod make-load-form ((obj acl-mp:process-lock) &optional env) (make-load-form-saving-slots obj :environment env)) -; this is just temporary until we get a patch for this in uri.fasl -(defmethod make-load-form ((self puri:uri) &optional env) - (declare (ignore env)) - `(make-instance ',(class-name (class-of self)) - :scheme ,(uri-scheme self) - :host ,(uri-host self) - :port ,(uri-port self) - :path ',(uri-path self) - :query ,(uri-query self) - :fragment ,(uri-fragment self) - :plist ',(uri-plist self) - :string ,(puri::uri-string self) - ; bug is missing ' in parsed-path value - :parsed-path ',(puri::uri-parsed-path self))) ) (defun save-proxy-cache (filename &key (server *wserver*)) |
|
From: Kevin R. <kev...@us...> - 2008-08-15 00:29:26
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat/lispworks In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18655/acl-compat/lispworks Modified Files: acl-mp.lisp Log Message: Patch from Lispworks Inc for Lispworks5 support Index: acl-mp.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/lispworks/acl-mp.lisp,v retrieving revision 1.4 retrieving revision 1.5 diff -u -w -r1.4 -r1.5 --- acl-mp.lisp 21 Dec 2003 14:59:05 -0000 1.4 +++ acl-mp.lisp 15 Aug 2008 00:29:35 -0000 1.5 @@ -46,6 +46,7 @@ ;; Import equivalent parts from the LispWorks MP package ;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +(eval-when (:compile-toplevel :load-toplevel :execute) (shadowing-import '( mp:*current-process* mp:process-kill @@ -63,7 +64,9 @@ mp:process-wait mp::process-active-p )) +) +(eval-when (:compile-toplevel :load-toplevel :execute) (export '( *current-process* process-kill process-enable @@ -80,6 +83,7 @@ process-wait process-active-p )) +) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Implement missing (and differing) functions ;; @@ -89,7 +93,12 @@ resume-hook suspend-hook initial-bindings run-immediately) (declare (ignore priority quantum reset-action resume-hook suspend-hook run-immediately)) (let ((mp:*process-initial-bindings* initial-bindings)) - (mp:create-process name :run-reasons run-reasons :arrest-reasons arrest-reasons))) + #+(or lispworks4 lispworks5.0) + (mp:create-process name :run-reasons run-reasons :arrest-reasons arrest-reasons) + #-(or lispworks4 lispworks5.0) + (if arrest-reasons + (error "Cannot set arrest-reasons in this version of LispWorks.") + (mp:create-process name :run-reasons run-reasons)))) (defun process-run-function (name-or-options preset-function &rest preset-arguments) (let ((process (ctypecase name-or-options |
|
From: Rudi S. <ru...@us...> - 2007-02-25 12:21:54
|
Update of /cvsroot/portableaserve/portableaserve/aserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20928/aserve Modified Files: parse.cl client.cl Log Message: * Merge fixes from Hannu Koivisto (mail "Various Fixes" to paserve-help 25 Feb) Index: parse.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/parse.cl,v retrieving revision 1.12 retrieving revision 1.13 diff -u -w -r1.12 -r1.13 --- parse.cl 20 Feb 2005 12:20:45 -0000 1.12 +++ parse.cl 25 Feb 2007 12:21:52 -0000 1.13 @@ -50,17 +50,18 @@ ) (defvar *parseobjs* nil) +(defvar *parseobj-lock* (acl-compat.mp:make-process-lock :name "Parse object lock")) (defun allocate-parseobj () (let (res) - (acl-compat.mp:without-scheduling + (acl-compat.mp:with-process-lock (*parseobj-lock*) (if* (setq res (pop *parseobjs*)) then (setf (parseobj-next res) 0) res else (make-parseobj))))) (defun free-parseobj (po) - (acl-compat.mp:without-scheduling + (acl-compat.mp:with-process-lock (*parseobj-lock*) (push po *parseobjs*))) (defun add-to-parseobj (po start end) Index: client.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/client.cl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -w -r1.18 -r1.19 --- client.cl 20 Feb 2005 12:20:45 -0000 1.18 +++ client.cl 25 Feb 2007 12:21:52 -0000 1.19 @@ -808,11 +808,12 @@ ;; line (defvar *response-header-buffers* nil) +(defvar *response-header-pool-lock* (acl-compat.mp:make-process-lock :name "ACLCompat response header buffer spool lock")) (defun get-header-line-buffer () ;; return the next header line buffer (let (buff) - (acl-compat.excl::atomically + (acl-compat.mp:with-process-lock (*response-header-pool-lock*) (acl-compat.excl::fast (setq buff (pop *response-header-buffers*)))) (if* buff thenret @@ -820,7 +821,7 @@ (defun put-header-line-buffer (buff &optional buff2) ;; put back up to two buffers - (acl-compat.mp:without-scheduling + (acl-compat.mp:with-process-lock (*response-header-pool-lock*) (push buff *response-header-buffers*) (if* buff2 then (push buff2 *response-header-buffers*)))) |
|
From: Rudi S. <ru...@us...> - 2007-02-25 12:21:54
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20928/acl-compat Modified Files: lw-buffering.lisp Log Message: * Merge fixes from Hannu Koivisto (mail "Various Fixes" to paserve-help 25 Feb) Index: lw-buffering.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/lw-buffering.lisp,v retrieving revision 1.14 retrieving revision 1.15 diff -u -w -r1.14 -r1.15 --- lw-buffering.lisp 15 Dec 2003 15:10:41 -0000 1.14 +++ lw-buffering.lisp 25 Feb 2007 12:21:52 -0000 1.15 @@ -128,6 +128,11 @@ (setf index 0 limit read-bytes))))) +(defmethod stream-listen ((stream buffered-stream-mixin)) + (with-stream-input-buffer (buffer index limit) stream + (or (and index (< index limit)) + (call-next-method)))) + (defmethod stream-read-byte ((stream buffered-bivalent-input-stream)) (with-stream-input-buffer (buffer index limit) stream (unless (and index (< index limit)) |
|
From: Rudi S. <ru...@us...> - 2007-02-25 12:21:54
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat/sbcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20928/acl-compat/sbcl Modified Files: acl-socket.lisp Log Message: * Merge fixes from Hannu Koivisto (mail "Various Fixes" to paserve-help 25 Feb) Index: acl-socket.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/sbcl/acl-socket.lisp,v retrieving revision 1.9 retrieving revision 1.10 diff -u -w -r1.9 -r1.10 --- acl-socket.lisp 31 Aug 2004 20:36:22 -0000 1.9 +++ acl-socket.lisp 25 Feb 2007 12:21:52 -0000 1.10 @@ -43,7 +43,7 @@ (let* ((socket (socket-accept (socket server-socket))) (stream (socket-make-stream socket :input t :output t - ; :buffering :none + ;; :buffering :none :element-type (element-type server-socket) :auto-close t))) @@ -134,7 +134,13 @@ (socket-connect socket (lookup-hostname remote-host) remote-port) (let ((stream (socket-make-stream socket :input t :output t :element-type element-type - ; :buffering :none + ;; No buffering temporarily + ;; for SBCL due to fd-stream + ;; problems, see + ;; portableaserve-help Mail + ;; "Various fixes" (Hannu + ;; Koivisto, 2007-02-25) + #+sbcl :buffering #+sbcl :none ))) (if (eq :bivalent format) ;; HACK: remember socket, so we can do peer lookup |
|
From: Rudi S. <ru...@us...> - 2006-06-21 08:06:52
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32734/acl-compat Modified Files: packages.lisp acl-compat.asd Log Message: Apply "patch: fixes for cvs openmcl" (James Bielman via paserve-discuss) Index: packages.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/packages.lisp,v retrieving revision 1.27 retrieving revision 1.28 diff -u -w -r1.27 -r1.28 --- packages.lisp 20 Oct 2005 07:54:06 -0000 1.27 +++ packages.lisp 21 Jun 2006 08:06:47 -0000 1.28 @@ -21,7 +21,7 @@ #+clisp #:ext #+sbcl #:sb-ext #+sbcl #:sb-gray #+(or allegro cormanlisp) :excl - #+mcl :ccl + #+(or mcl openmcl) :ccl ) #+lispworks (:import-from :common-lisp #:fixnump) #+sbcl (:import-from :sb-int #:fixnump) @@ -46,12 +46,12 @@ #:fast #:without-package-locks #:fixnump - #+(or lispworks mcl) #:socket-error - #+(or allegro lispworks mcl) #:run-shell-command - #+(or allegro mcl) #:fasl-read - #+(or allegro mcl) #:fasl-write - #+(or allegro cmu scl mcl lispworks) #:string-to-octets - #+(or allegro cmu scl mcl lispworks) #:write-vector + #+(or lispworks mcl openmcl) #:socket-error + #+(or allegro lispworks mcl openmcl) #:run-shell-command + #+(or allegro mcl openmcl) #:fasl-read + #+(or allegro mcl openmcl) #:fasl-write + #+(or allegro cmu scl mcl lispworks openmcl) #:string-to-octets + #+(or allegro cmu scl mcl lispworks openmcl) #:write-vector )) @@ -181,7 +181,7 @@ (defpackage :gray-stream (:use #:common-lisp) (:import-from #+lispworks :stream #+cmu :lisp #+clisp :gray #+cormanlisp :gray-streams - #+mcl :ccl #+allegro :excl #+sbcl :sb-gray + #+(or mcl openmcl) :ccl #+allegro :excl #+sbcl :sb-gray #:fundamental-binary-input-stream #:fundamental-binary-output-stream #:fundamental-character-input-stream Index: acl-compat.asd =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/acl-compat.asd,v retrieving revision 1.54 retrieving revision 1.55 diff -u -w -r1.54 -r1.55 --- acl-compat.asd 8 Apr 2006 14:06:18 -0000 1.54 +++ acl-compat.asd 21 Jun 2006 08:06:47 -0000 1.55 @@ -103,7 +103,7 @@ (defun lisp-system-shortname () #+allegro :allegro #+lispworks :lispworks #+cmu :cmucl - #+mcl :mcl #+clisp :clisp #+scl :scl #+sbcl :sbcl) ;mcl/openmcl use the same directory + #+(or mcl openmcl) :mcl #+clisp :clisp #+scl :scl #+sbcl :sbcl) ;mcl/openmcl use the same directory (defmethod component-pathname ((component unportable-cl-source-file)) (let ((pathname (call-next-method)) @@ -143,11 +143,11 @@ :depends-on ("packages" "acl-excl" #-lispworks "lw-buffering")) ;; Multiprocessing - #+mcl (:unportable-cl-source-file "mcl-timers") + #+(or mcl openmcl) (:unportable-cl-source-file "mcl-timers") (:unportable-cl-source-file "acl-mp" - :depends-on ("packages" #+mcl "mcl-timers")) + :depends-on ("packages" #+(or mcl openmcl) "mcl-timers")) ;; Sockets, networking; TODO: de-frob this a bit - #-mcl + #-(or mcl openmcl) (:unportable-cl-source-file "acl-socket" :depends-on ("packages" "acl-excl" #-(or allegro (and mcl (not openmcl))) "chunked-stream-mixin")) @@ -156,7 +156,7 @@ #+(and mcl (not openmcl) (not carbon-compat)) (:unportable-cl-source-file "mcl-stream-fix" :depends-on ("acl-socket-mcl")) - #+(and mcl openmcl) + #+openmcl (:unportable-cl-source-file "acl-socket-openmcl" :depends-on ("packages" "chunked-stream-mixin")) ;; Diverse macros, utility functions @@ -166,9 +166,9 @@ #+allegro ("packages")) (:unportable-cl-source-file "acl-sys" :depends-on ("packages")) ;; SSL - #+(and ssl-available (not (or allegro mcl clisp))) + #+(and ssl-available (not (or allegro mcl openmcl clisp))) (:file "acl-ssl" :depends-on ("acl-ssl-streams" "acl-socket")) - #+(and ssl-available (not (or allegro mcl clisp))) + #+(and ssl-available (not (or allegro mcl openmcl clisp))) (:file "acl-ssl-streams" :depends-on ("packages"))) ;; Dependencies :depends-on (:puri |
|
From: Rudi S. <ru...@us...> - 2006-06-21 08:06:52
|
Update of /cvsroot/portableaserve/portableaserve/aserve/htmlgen In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32734/aserve/htmlgen Modified Files: htmlgen.cl Log Message: Apply "patch: fixes for cvs openmcl" (James Bielman via paserve-discuss) Index: htmlgen.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/htmlgen/htmlgen.cl,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- htmlgen.cl 2 Dec 2003 14:20:39 -0000 1.7 +++ htmlgen.cl 21 Jun 2006 08:06:47 -0000 1.8 @@ -91,7 +91,7 @@ (defvar *html-stream* nil) ; where the output goes -(defmacro html (&rest forms &environment env) +(defmacro html (&body forms &environment env) ;; just emit html to the curfent stream (process-html-forms forms env)) |
|
From: Rudi S. <ru...@us...> - 2006-04-24 12:18:45
|
Update of /cvsroot/portableaserve/portableaserve/libs In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7469/libs Modified Files: asdf.lisp Log Message: Update to upstream asdf 1.96 Index: asdf.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/libs/asdf.lisp,v retrieving revision 1.1 retrieving revision 1.2 diff -u -w -r1.1 -r1.2 --- asdf.lisp 8 Feb 2004 15:42:38 -0000 1.1 +++ asdf.lisp 24 Apr 2006 12:18:31 -0000 1.2 @@ -90,10 +90,12 @@ #:*asdf-revision* #:operation-error #:compile-failed #:compile-warned #:compile-error + #:error-component #:error-operation #:system-definition-error #:missing-component #:missing-dependency #:circular-dependency ; errors + #:duplicate-names #:retry #:accept ; restarts @@ -156,6 +158,9 @@ (define-condition circular-dependency (system-definition-error) ((components :initarg :components :reader circular-dependency-components))) +(define-condition duplicate-names (system-definition-error) + ((name :initarg :name :reader duplicate-names-name))) + (define-condition missing-component (system-definition-error) ((requires :initform "(unnamed)" :reader missing-requires :initarg :requires) (version :initform nil :reader missing-version :initarg :version) @@ -168,7 +173,7 @@ ((component :reader error-component :initarg :component) (operation :reader error-operation :initarg :operation)) (:report (lambda (c s) - (format s (formatter "~@<erred while invoking ~A on ~A~@:>") + (format s "~@<erred while invoking ~A on ~A~@:>" (error-operation c) (error-component c))))) (define-condition compile-error (operation-error) ()) (define-condition compile-failed (compile-error) ()) @@ -199,9 +204,8 @@ ;;;; methods: conditions (defmethod print-object ((c missing-dependency) s) - (format s (formatter "~@<~A, required by ~A~@:>") - (call-next-method c nil) - (missing-required-by c))) + (format s "~@<~A, required by ~A~@:>" + (call-next-method c nil) (missing-required-by c))) (defun sysdef-error (format &rest arguments) (error 'formatted-system-definition-error :format-control format :format-arguments arguments)) @@ -209,9 +213,9 @@ ;;;; methods: components (defmethod print-object ((c missing-component) s) - (format s (formatter "~@<component ~S not found~ + (format s "~@<component ~S not found~ ~@[ or does not match version ~A~]~ - ~@[ in ~A~]~@:>") + ~@[ in ~A~]~@:>" (missing-requires c) (missing-version c) (when (missing-parent c) @@ -326,8 +330,7 @@ (component (component-name name)) (symbol (string-downcase (symbol-name name))) (string name) - (t (sysdef-error (formatter "~@<invalid component designator ~A~@:>") - name)))) + (t (sysdef-error "~@<invalid component designator ~A~@:>" name)))) ;;; for the sake of keeping things reasonably neat, we adopt a ;;; convention that functions in this list are prefixed SYSDEF- @@ -356,6 +359,14 @@ (if (and file (probe-file file)) (return file))))))) +(defun make-temporary-package () + (flet ((try (counter) + (ignore-errors + (make-package (format nil "ASDF~D" counter) + :use '(:cl :asdf))))) + (do* ((counter 0 (+ counter 1)) + (package (try counter) (try counter))) + (package package)))) (defun find-system (name &optional (error-p t)) (let* ((name (coerce-name name)) @@ -364,15 +375,18 @@ (when (and on-disk (or (not in-memory) (< (car in-memory) (file-write-date on-disk)))) - (let ((*package* (make-package (gensym (package-name #.*package*)) - :use '(:cl :asdf)))) - (format *verbose-out* - (formatter "~&~@<; ~@;loading system definition from ~A into ~A~@:>~%") + (let ((package (make-temporary-package))) + (unwind-protect + (let ((*package* package)) + (format + *verbose-out* + "~&~@<; ~@;loading system definition from ~A into ~A~@:>~%" ;; FIXME: This wants to be (ENOUGH-NAMESTRING ;; ON-DISK), but CMUCL barfs on that. on-disk *package*) - (load on-disk))) + (load on-disk)) + (delete-package package)))) (let ((in-memory (gethash name *defined-systems*))) (if in-memory (progn (if on-disk (setf (car in-memory) (file-write-date on-disk))) @@ -380,8 +394,7 @@ (if error-p (error 'missing-component :requires name)))))) (defun register-system (name system) - (format *verbose-out* - (formatter "~&~@<; ~@;registering ~A as ~A~@:>~%") system name) + (format *verbose-out* "~&~@<; ~@;registering ~A as ~A~@:>~%" system name) (setf (gethash (coerce-name name) *defined-systems*) (cons (get-universal-time) system))) @@ -427,17 +440,20 @@ (defmethod source-file-type ((c static-file) (s module)) nil) (defmethod component-relative-pathname ((component source-file)) - (let* ((*default-pathname-defaults* (component-parent-pathname component)) + (let ((relative-pathname (slot-value component 'relative-pathname))) + (if relative-pathname + (merge-pathnames + relative-pathname + (make-pathname + :type (source-file-type component (component-system component)))) + (let* ((*default-pathname-defaults* + (component-parent-pathname component)) (name-type (make-pathname :name (component-name component) :type (source-file-type component (component-system component))))) - (if (slot-value component 'relative-pathname) - (merge-pathnames - (slot-value component 'relative-pathname) - name-type) - name-type))) + name-type)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; operations @@ -567,6 +583,20 @@ (defmethod input-files ((operation operation) (c module)) nil) (defmethod operation-done-p ((o operation) (c component)) + (flet ((fwd-or-return-t (file) + ;; if FILE-WRITE-DATE returns NIL, it's possible that the + ;; user or some other agent has deleted an input file. If + ;; that's the case, well, that's not good, but as long as + ;; the operation is otherwise considered to be done we + ;; could continue and survive. + (let ((date (file-write-date file))) + (cond + (date) + (t + (warn "~@<Missing FILE-WRITE-DATE for ~S: treating ~ + operation ~S on component ~S as done.~@:>" + file o c) + (return-from operation-done-p t)))))) (let ((out-files (output-files o c)) (in-files (input-files o c))) (cond ((and (not in-files) (not out-files)) @@ -579,14 +609,14 @@ (component-operation-times c)))) (and op-done (>= op-done - (or (apply #'max - (mapcar #'file-write-date in-files)) 0))))) + (apply #'max + (mapcar #'fwd-or-return-t in-files)))))) ((not in-files) nil) (t (and (every #'probe-file out-files) (> (apply #'min (mapcar #'file-write-date out-files)) - (apply #'max (mapcar #'file-write-date in-files)) )))))) + (apply #'max (mapcar #'fwd-or-return-t in-files))))))))) ;;; So you look at this code and think "why isn't it a bunch of ;;; methods". And the answer is, because standard method combination @@ -676,16 +706,15 @@ (defmethod perform ((operation operation) (c source-file)) (sysdef-error - (formatter "~@<required method PERFORM not implemented~ - for operation ~A, component ~A~@:>") + "~@<required method PERFORM not implemented ~ + for operation ~A, component ~A~@:>" (class-of operation) (class-of c))) (defmethod perform ((operation operation) (c module)) nil) (defmethod explain ((operation operation) (component component)) - (format *verbose-out* "~&;;; ~A on ~A~%" - operation component)) + (format *verbose-out* "~&;;; ~A on ~A~%" operation component)) ;;; compile-op @@ -706,6 +735,7 @@ ;;; perform is required to check output-files to find out where to put ;;; its answers, in case it has been overridden for site policy (defmethod perform ((operation compile-op) (c cl-source-file)) + #-:broken-fasl-loader (let ((source-file (component-pathname c)) (output-file (car (output-files operation c)))) (multiple-value-bind (output warnings-p failure-p) @@ -715,16 +745,14 @@ (when warnings-p (case (operation-on-warnings operation) (:warn (warn - (formatter "~@<COMPILE-FILE warned while ~ - performing ~A on ~A.~@:>") + "~@<COMPILE-FILE warned while performing ~A on ~A.~@:>" operation c)) (:error (error 'compile-warned :component c :operation operation)) (:ignore nil))) (when failure-p (case (operation-on-failure operation) (:warn (warn - (formatter "~@<COMPILE-FILE failed while ~ - performing ~A on ~A.~@:>") + "~@<COMPILE-FILE failed while performing ~A on ~A.~@:>" operation c)) (:error (error 'compile-failed :component c :operation operation)) (:ignore nil))) @@ -732,7 +760,8 @@ (error 'compile-error :component c :operation operation))))) (defmethod output-files ((operation compile-op) (c cl-source-file)) - (list (compile-file-pathname (component-pathname c)))) + #-:broken-fasl-loader (list (compile-file-pathname (component-pathname c))) + #+:broken-fasl-loader (list (component-pathname c))) (defmethod perform ((operation compile-op) (c static-file)) nil) @@ -817,15 +846,14 @@ (retry () :report (lambda (s) - (format s - (formatter "~@<Retry performing ~S on ~S.~@:>") + (format s "~@<Retry performing ~S on ~S.~@:>" op component))) (accept () :report (lambda (s) (format s - (formatter "~@<Continue, treating ~S on ~S as ~ - having been successful.~@:>") + "~@<Continue, treating ~S on ~S as ~ + having been successful.~@:>" op component)) (setf (gethash (type-of op) (component-operation-times component)) @@ -878,15 +906,16 @@ (defun class-for-type (parent type) - (let ((class (find-class + (let ((class + (find-class (or (find-symbol (symbol-name type) *package*) - (find-symbol (symbol-name type) #.*package*)) nil))) + (find-symbol (symbol-name type) #.(package-name *package*))) + nil))) (or class (and (eq type :file) (or (module-default-component-class parent) (find-class 'cl-source-file))) - (sysdef-error (formatter "~@<don't recognize component type ~A~@:>") - type)))) + (sysdef-error "~@<don't recognize component type ~A~@:>" type)))) (defun maybe-add-tree (tree op1 op2 c) "Add the node C at /OP1/OP2 in TREE, unless it's there already. @@ -929,18 +958,31 @@ ;; remove-keys form. important to keep them in sync components pathname default-component-class perform explain output-files operation-done-p + weakly-depends-on depends-on serial in-order-to ;; list ends &allow-other-keys) options - (check-component-input type name depends-on components in-order-to) + (check-component-input type name weakly-depends-on depends-on components in-order-to) + + (when (and parent + (find-component parent name) + ;; ignore the same object when rereading the defsystem + (not + (typep (find-component parent name) + (class-for-type parent type)))) + (error 'duplicate-names :name name)) + (let* ((other-args (remove-keys '(components pathname default-component-class perform explain output-files operation-done-p + weakly-depends-on depends-on serial in-order-to) rest)) (ret (or (find-component parent name) (make-instance (class-for-type parent type))))) + (when weakly-depends-on + (setf depends-on (append depends-on (remove-if (complement #'find-system) weakly-depends-on)))) (when (boundp '*serial-depends-on*) (setf depends-on (concatenate 'list *serial-depends-on* depends-on))) @@ -961,7 +1003,19 @@ for c = (parse-component-form ret c-form) collect c if serial - do (push (component-name c) *serial-depends-on*))))) + do (push (component-name c) *serial-depends-on*)))) + + ;; check for duplicate names + (let ((name-hash (make-hash-table :test #'equal))) + (loop for c in (module-components ret) + do + (if (gethash (component-name c) + name-hash) + (error 'duplicate-names + :name (component-name c)) + (setf (gethash (component-name c) + name-hash) + t))))) (setf (slot-value ret 'in-order-to) (union-of-dependencies @@ -987,11 +1041,15 @@ (component-inline-methods ret)))) ret))) -(defun check-component-input (type name depends-on components in-order-to) +(defun check-component-input (type name weakly-depends-on depends-on components in-order-to) "A partial test of the values of a component." + (when weakly-depends-on (warn "We got one! XXXXX")) (unless (listp depends-on) (sysdef-error-component ":depends-on must be a list." type name depends-on)) + (unless (listp weakly-depends-on) + (sysdef-error-component ":weakly-depends-on must be a list." + type name weakly-depends-on)) (unless (listp components) (sysdef-error-component ":components must be NIL or a list of components." type name components)) @@ -1018,14 +1076,15 @@ (defun run-shell-command (control-string &rest args) "Interpolate ARGS into CONTROL-STRING as if by FORMAT, and synchronously execute the result using a Bourne-compatible shell, with -output to *verbose-out*. Returns the shell's exit code." +output to *VERBOSE-OUT*. Returns the shell's exit code." (let ((command (apply #'format nil control-string args))) (format *verbose-out* "; $ ~A~%" command) #+sbcl - (sb-impl::process-exit-code + (sb-ext:process-exit-code (sb-ext:run-program - "/bin/sh" + #+win32 "sh" #-win32 "/bin/sh" (list "-c" command) + #+win32 #+win32 :search t :input nil :output *verbose-out*)) #+(or cmu scl) @@ -1053,8 +1112,9 @@ (ccl:run-program "/bin/sh" (list "-c" command) :input nil :output *verbose-out* :wait t))) - - #-(or openmcl clisp lispworks allegro scl cmu sbcl) + #+ecl ;; courtesy of Juan Jose Garcia Ripoll + (si:system command) + #-(or openmcl clisp lispworks allegro scl cmu sbcl ecl) (error "RUN-SHELL-PROGRAM not implemented for this Lisp") )) @@ -1084,10 +1144,17 @@ (asdf:operate 'asdf:load-op name) t)))) - (pushnew - '(merge-pathnames "systems/" - (truename (sb-ext:posix-getenv "SBCL_HOME"))) - *central-registry*) + (defun contrib-sysdef-search (system) + (let* ((name (coerce-name system)) + (home (truename (sb-ext:posix-getenv "SBCL_HOME"))) + (contrib (merge-pathnames + (make-pathname :directory `(:relative ,name) + :name name + :type "asd" + :case :local + :version :newest) + home))) + (probe-file contrib))) (pushnew '(merge-pathnames "site-systems/" @@ -1099,6 +1166,7 @@ (user-homedir-pathname)) *central-registry*) - (pushnew 'module-provide-asdf sb-ext:*module-provider-functions*)) + (pushnew 'module-provide-asdf sb-ext:*module-provider-functions*) + (pushnew 'contrib-sysdef-search *system-definition-search-functions*)) (provide 'asdf) |
|
From: Rudi S. <ru...@us...> - 2006-04-08 14:06:24
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10641/acl-compat Modified Files: acl-excl-common.lisp acl-compat.asd Log Message: Merge "Problems with non-Debian CMUCL and acl-compat" (Stefan Scholl, paserve-discuss 2006-04-04) ... untested, since I don't have a running cmucl anywhere Index: acl-excl-common.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/acl-excl-common.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- acl-excl-common.lisp 18 Feb 2005 20:24:30 -0000 1.7 +++ acl-excl-common.lisp 8 Apr 2006 14:06:17 -0000 1.8 @@ -185,6 +185,7 @@ `(locally (declare (optimize (speed 3) (safety 0) (debug 0))) ,@forms)) +#-cmu (defun write-vector (sequence stream &key (start 0) end endian-swap) (declare (ignore endian-swap)) (check-type sequence (or string (array (unsigned-byte 8) 1) Index: acl-compat.asd =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/acl-compat.asd,v retrieving revision 1.53 retrieving revision 1.54 diff -u -w -r1.53 -r1.54 --- acl-compat.asd 5 Aug 2004 04:46:47 -0000 1.53 +++ acl-compat.asd 8 Apr 2006 14:06:18 -0000 1.54 @@ -26,6 +26,7 @@ (defmethod operation-done-p ((operation load-op) (c precompiled-file)) nil) +#-gray-streams (eval-when (:compile-toplevel :load-toplevel :execute) (unless (asdf:find-system :cmucl-graystream nil) (asdf:defsystem cmucl-graystream @@ -174,7 +175,7 @@ :cl-ppcre #+sbcl :sb-bsd-sockets #+sbcl :sb-posix - #+cmu :cmucl-graystream + #+(and cmu (not gray-streams)) :cmucl-graystream #+(and (or cmu lispworks) ssl-available) :cl-ssl ) :perform (load-op :after (op acl-compat) |
|
From: Rudi S. <ru...@us...> - 2006-02-19 10:32:54
|
Update of /cvsroot/portableaserve/portableaserve/aserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18930/aserve Modified Files: main.cl Log Message: Fix some package errors : s/socket/acl-compat.socket/ Index: main.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/main.cl,v retrieving revision 1.45 retrieving revision 1.46 diff -u -w -r1.45 -r1.46 --- main.cl 20 Oct 2005 07:54:06 -0000 1.45 +++ main.cl 19 Feb 2006 10:32:44 -0000 1.46 @@ -1522,8 +1522,8 @@ (if* error-obj then (brief-logmess (format nil "While reading http request~:_ from ~a:~:_ ~a" - (socket:ipaddr-to-dotted - (socket::remote-host sock)) + (acl-compat.socket:ipaddr-to-dotted + (acl-compat.socket:remote-host sock)) error-obj))) ; notify the client if it's still listening |
|
From: Rudi S. <ru...@us...> - 2006-01-22 13:01:39
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16162/acl-compat Modified Files: ChangeLog Log Message: Argh; fix last night's checkin Index: ChangeLog =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/ChangeLog,v retrieving revision 1.50 retrieving revision 1.51 diff -u -w -r1.50 -r1.51 --- ChangeLog 21 Jan 2006 16:51:45 -0000 1.50 +++ ChangeLog 22 Jan 2006 13:01:22 -0000 1.51 @@ -1,3 +1,10 @@ +2006-01-22 Rudi Schlatte <ru...@co...> + + * sbcl/acl-mp.lisp (defun/sb-thread): silence compilation style + warning on single-threaded sbcl + + * sbcl/acl-excl.lisp (filesys-type): Fix bogus variable name :( + 2006-01-21 Rudi Schlatte <ru...@co...> * sbcl/acl-excl.lisp (filesys-type, filesys-inode): use sb-posix |
|
From: Rudi S. <ru...@us...> - 2006-01-22 13:01:39
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat/sbcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16162/acl-compat/sbcl Modified Files: acl-mp.lisp acl-excl.lisp Log Message: Argh; fix last night's checkin Index: acl-mp.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/sbcl/acl-mp.lisp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -w -r1.15 -r1.16 --- acl-mp.lisp 5 Aug 2005 09:25:25 -0000 1.15 +++ acl-mp.lisp 22 Jan 2006 13:01:22 -0000 1.16 @@ -67,6 +67,7 @@ p)) (defmacro defun/sb-thread (name args &body body) + #-sb-thread (declare (ignore body)) `(defun ,name ,args #-sb-thread (declare (ignore ,@(remove-if Index: acl-excl.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/sbcl/acl-excl.lisp,v retrieving revision 1.7 retrieving revision 1.8 diff -u -w -r1.7 -r1.8 --- acl-excl.lisp 21 Jan 2006 16:51:45 -0000 1.7 +++ acl-excl.lisp 22 Jan 2006 13:01:22 -0000 1.8 @@ -11,7 +11,7 @@ stream) (defun filesys-type (file-or-directory-name) - (let ((mode (sb-posix:stat-mode (sb-posix:stat path)))) + (let ((mode (sb-posix:stat-mode (sb-posix:stat file-or-directory-name)))) (cond ((sb-posix:s-isreg mode) :file) ((sb-posix:s-isdir mode) :directory) |
|
From: Rudi S. <ru...@us...> - 2006-01-21 16:51:53
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29801/acl-compat Modified Files: ChangeLog Log Message: Fixes, partly sbcl-specific * acl-compat/sbcl/acl-excl.lisp (filesys-type, filesys-inode): use sb-posix instead of sbcl internals * aserve/proxy.cl (write-body-buffers): initialize len to numeric value in all cases Index: ChangeLog =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/ChangeLog,v retrieving revision 1.49 retrieving revision 1.50 diff -u -w -r1.49 -r1.50 --- ChangeLog 5 Aug 2005 09:25:25 -0000 1.49 +++ ChangeLog 21 Jan 2006 16:51:45 -0000 1.50 @@ -1,3 +1,8 @@ +2006-01-21 Rudi Schlatte <ru...@co...> + + * sbcl/acl-excl.lisp (filesys-type, filesys-inode): use sb-posix + instead of sbcl internals + 2005-08-05 Gabor Melis <me...@ho...> * sbcl/acl-mp.lisp: updated to use the thread object api |
|
From: Rudi S. <ru...@us...> - 2006-01-21 16:51:53
|
Update of /cvsroot/portableaserve/portableaserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29801 Modified Files: ChangeLog Log Message: Fixes, partly sbcl-specific * acl-compat/sbcl/acl-excl.lisp (filesys-type, filesys-inode): use sb-posix instead of sbcl internals * aserve/proxy.cl (write-body-buffers): initialize len to numeric value in all cases Index: ChangeLog =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/ChangeLog,v retrieving revision 1.31 retrieving revision 1.32 diff -u -w -r1.31 -r1.32 --- ChangeLog 5 Jul 2005 17:28:16 -0000 1.31 +++ ChangeLog 21 Jan 2006 16:51:45 -0000 1.32 @@ -1,3 +1,8 @@ +2006-01-21 Rudi Schlatte <ru...@co...> + + * aserve/proxy.cl (write-body-buffers): initialize len to numeric + value in all cases + 2005-07-05 Klaus Harbo <kl...@mu...> * acl-compat/lispworks/acl-socket.lisp (make-ssl-client-stream): |
|
From: Rudi S. <ru...@us...> - 2006-01-21 16:51:53
|
Update of /cvsroot/portableaserve/portableaserve/aserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29801/aserve Modified Files: proxy.cl Log Message: Fixes, partly sbcl-specific * acl-compat/sbcl/acl-excl.lisp (filesys-type, filesys-inode): use sb-posix instead of sbcl internals * aserve/proxy.cl (write-body-buffers): initialize len to numeric value in all cases Index: proxy.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/proxy.cl,v retrieving revision 1.16 retrieving revision 1.17 diff -u -w -r1.16 -r1.17 --- proxy.cl 20 Feb 2005 12:20:45 -0000 1.16 +++ proxy.cl 21 Jan 2006 16:51:44 -0000 1.17 @@ -930,7 +930,7 @@ (defun write-body-buffers (sock buffers length) ;; write all the data in the buffers to the socket (if* (> length 0) - then (let ((len (if* buffers then (length (car buffers))))) + then (let ((len (if buffers (length (car buffers)) length))) (dolist (buff buffers) (write-sequence buff sock :end (min length len)) (decf length len) |
|
From: Rudi S. <ru...@us...> - 2006-01-21 16:51:53
|
Update of /cvsroot/portableaserve/portableaserve/acl-compat/sbcl In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29801/acl-compat/sbcl Modified Files: acl-excl.lisp Log Message: Fixes, partly sbcl-specific * acl-compat/sbcl/acl-excl.lisp (filesys-type, filesys-inode): use sb-posix instead of sbcl internals * aserve/proxy.cl (write-body-buffers): initialize len to numeric value in all cases Index: acl-excl.lisp =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/acl-compat/sbcl/acl-excl.lisp,v retrieving revision 1.6 retrieving revision 1.7 diff -u -w -r1.6 -r1.7 --- acl-excl.lisp 31 Aug 2004 02:53:16 -0000 1.6 +++ acl-excl.lisp 21 Jan 2006 16:51:45 -0000 1.7 @@ -11,12 +11,11 @@ stream) (defun filesys-type (file-or-directory-name) - (if (eq :directory (sb-unix:unix-file-kind - (namestring file-or-directory-name))) - :directory - (if (probe-file file-or-directory-name) - :file - nil))) + (let ((mode (sb-posix:stat-mode (sb-posix:stat path)))) + (cond + ((sb-posix:s-isreg mode) :file) + ((sb-posix:s-isdir mode) :directory) + (t nil)))) (defmacro atomically (&body forms) `(acl-mp:without-scheduling ,@forms)) @@ -26,11 +25,7 @@ (error "unix-signal not implemented in acl-excl-sbcl.lisp")) (defun filesys-inode (path) - (multiple-value-bind (found ign inode) - (sb-unix::unix-lstat path) - (if found - inode - (error "path ~s does not exist" path)))) + (sb-posix:stat-ino (sb-posix:lstat path))) (defun cl-internal-real-time () (round (/ (get-internal-real-time) internal-time-units-per-second))) |
|
From: Edi W. <nh...@us...> - 2005-10-20 07:54:14
|
Update of /cvsroot/portableaserve/portableaserve/aserve In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21768/aserve Modified Files: main.cl Log Message: use LispWorks' "native" SSL support (Alain Picard) Index: main.cl =================================================================== RCS file: /cvsroot/portableaserve/portableaserve/aserve/main.cl,v retrieving revision 1.44 retrieving revision 1.45 diff -u -w -r1.44 -r1.45 --- main.cl 5 Aug 2005 09:52:37 -0000 1.44 +++ main.cl 20 Oct 2005 07:54:06 -0000 1.45 @@ -988,7 +988,8 @@ ;; return the server object #+mswindows (declare (ignore setuid setgid)) - #-(and allegro (version>= 6 2 beta)) + #-(or (and allegro (version>= 6 2 beta)) + (and :lispworks4.4 (not :cl-ssl))) (declare (ignore ssl-password)) (declare (ignore debug)) ; for now @@ -1015,8 +1016,10 @@ #'(lambda (socket) (funcall 'acl-compat.socket::make-ssl-server-stream socket :certificate ssl - #+(and allegro (version>= 6 2 beta)) :certificate-password - #+(and allegro (version>= 6 2 beta)) ssl-password))) + #+(or (and allegro (version>= 6 2 beta)) + (and :lispworks4.4 (not :cl-ssl))) :certificate-password + #+(or (and allegro (version>= 6 2 beta)) + (and :lispworks4.4 (not :cl-ssl))) ssl-password))) (setq chunking nil) ; doesn't work well through ssl (if* (not port-p) then ; ssl defaults to port 443 |