X-Git-Url: http://git.kpe.io/?p=cl-modlisp.git;a=blobdiff_plain;f=base.lisp;h=ef54314d12761284a40b2417280c577d008601d5;hp=b50a088867a8f6865923fdf69839e98fab86364a;hb=HEAD;hpb=fa641fe08adb5cede535a6dd79a79047c78ecf8a

diff --git a/base.lisp b/base.lisp
index b50a088..ef54314 100644
--- a/base.lisp
+++ b/base.lisp
@@ -7,80 +7,96 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.10 2003/07/10 18:58:29 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))
-  (let ((listener (make-instance 'listener :port port
-				 :base-name "modlisp"			 
-				 :function 'modlisp-command-issuer
-				 :function-args (cons processor processor-args)
-				 :format :text
-				 :wait nil
-				 :catch-errors catch-errors)))
-    (init/listener listener :start)))
-
-
-(defun modlisp-stop (listener)
-  (init/listener listener :stop))
+                           (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)))
+    (setf (listener server) listener)
+    (init/listener listener :start)
+    (setf *ml-server* server)
+    server))
+
+
+(defun modlisp-stop (server)
+  (init/listener (listener server) :stop)
+  (setf (listener server) nil)
+  server)
 
 (defun modlisp-stop-all ()
   (stop-all/listener))
 
 ;; Internal functions
 
-(defun modlisp-command-issuer (*modlisp-socket* processor &rest args)
+(defun modlisp-command-issuer (*modlisp-socket* server)
   "generates commands from modlisp, issues commands to processor-fun"
   (unwind-protect
        (progn
-	 (let ((*number-worker-requests* 0)
-	       (*close-modlisp-socket* t))
-	   (do ((command (read-modlisp-command) (read-modlisp-command)))
-	       ((null command))
-	     (apply processor command args)
-	     (force-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 #'string=)))
+  (cdr (assoc key header :test #'eq)))
 
 (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)))
 
+
 (defun read-modlisp-header ()
   (loop for key = (read-modlisp-line)
-      while (and key
-		 (string-not-equal key "end")
-		 (> (length key) 1))
+      while (and key (string-not-equal key "end"))
       for value = (read-modlisp-line)
-      collect (cons key value)))
+      collect (cons (ensure-keyword key) value)))
 
 (defun write-header-line (key value)
-  (write-string key *modlisp-socket*)
+  (write-string (string key) *modlisp-socket*)
   (write-char #\NewLine *modlisp-socket*)
   (write-string value *modlisp-socket*)
   (write-char #\NewLine *modlisp-socket*))