X-Git-Url: http://git.kpe.io/?p=cl-modlisp.git;a=blobdiff_plain;f=base.lisp;h=ef54314d12761284a40b2417280c577d008601d5;hp=5fc67e4974f55d4d56b443b3d17f321981ba4775;hb=HEAD;hpb=49f84ccd7347606524722e1c064027bb7c96c3a6 diff --git a/base.lisp b/base.lisp index 5fc67e4..ef54314 100644 --- a/base.lisp +++ b/base.lisp @@ -7,32 +7,32 @@ ;;;; Programmer: Kevin M. Rosenberg ;;;; Date Started: Dec 2002 ;;;; -;;;; $Id: base.lisp,v 1.14 2003/08/18 05:48:55 kevin Exp $ +;;;; $Id$ ;;;; ************************************************************************* (in-package #:modlisp) (defun modlisp-start (&key (port +default-modlisp-port+) - (processor 'demo-modlisp-command-processor) - (processor-args nil) - (catch-errors t) - timeout - number-fixed-workers - remote-host-checker) + (processor 'demo-modlisp-command-processor) + (processor-args nil) + (catch-errors t) + timeout + number-fixed-workers + remote-host-checker) (let* ((server (make-instance 'ml-server - :processor processor - :processor-args processor-args - :port port)) - (listener (make-instance 'listener :port port - :base-name "modlisp" - :function 'modlisp-command-issuer - :function-args (list server) - :format :text - :wait nil - :catch-errors catch-errors - :timeout timeout - :number-fixed-workers number-fixed-workers - :remote-host-checker remote-host-checker))) + :processor processor + :processor-args processor-args + :port port)) + (listener (make-instance 'listener :port port + :base-name "modlisp" + :function 'modlisp-command-issuer + :function-args (list server) + :format :text + :wait nil + :catch-errors catch-errors + :timeout timeout + :number-fixed-workers number-fixed-workers + :remote-host-checker remote-host-checker))) (setf (listener server) listener) (init/listener listener :start) (setf *ml-server* server) @@ -53,19 +53,19 @@ "generates commands from modlisp, issues commands to processor-fun" (unwind-protect (progn - (let ((*number-worker-requests* 0) - (*close-modlisp-socket* t) - (*ml-server* server)) - (do ((command (read-modlisp-command) (read-modlisp-command))) - ((null command)) - (apply (processor server) command (processor-args server)) - (finish-output *modlisp-socket*) - (incf *number-worker-requests*) - (incf *number-server-requests*) - (when *close-modlisp-socket* - (return))))) + (let ((*number-worker-requests* 0) + (*close-modlisp-socket* t) + (*ml-server* server)) + (do ((command (read-modlisp-command) (read-modlisp-command))) + ((null command)) + (apply (processor server) command (processor-args server)) + (finish-output *modlisp-socket*) + (incf *number-worker-requests*) + (incf *number-server-requests*) + (when *close-modlisp-socket* + (return))))) (close-active-socket *modlisp-socket*))) - + (defun header-value (header key) "Returns the value of a modlisp header" (cdr (assoc key header :test #'eq))) @@ -73,20 +73,20 @@ (defun read-modlisp-command () (ignore-errors (let* ((header (read-modlisp-header)) - (content-length (header-value header :content-length)) - (content (when content-length - (make-string - (parse-integer content-length :junk-allowed t))))) - (when content - (read-sequence content *modlisp-socket*) - (push (cons :posted-content content) header)) - header))) + (content-length (header-value header :content-length)) + (content (when content-length + (make-string + (parse-integer content-length :junk-allowed t))))) + (when content + (read-sequence content *modlisp-socket*) + (push (cons :posted-content content) header)) + header))) (defun read-modlisp-line () (kmrcl:string-right-trim-one-char #\return - (read-line *modlisp-socket* nil nil))) + (read-line *modlisp-socket* nil nil))) (defun read-modlisp-header ()