X-Git-Url: http://git.kpe.io/?a=blobdiff_plain;f=base.lisp;h=ebb2ece37c8932ef451c4a0d204444babd126e6c;hb=f63edd12886a0ed33be55f49c3284acca5db4797;hp=24c1689d08413fe5ff4b73925c8956b412d90553;hpb=40b5dce89637f3b90b71ee6ee3932aafa595640b;p=cl-modlisp.git

diff --git a/base.lisp b/base.lisp
index 24c1689..ebb2ece 100644
--- a/base.lisp
+++ b/base.lisp
@@ -7,94 +7,100 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: base.lisp,v 1.8 2003/07/08 16:12:03 kevin Exp $
+;;;; $Id: base.lisp,v 1.13 2003/07/16 20:40:43 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
 
-(defun modlisp-start (&key (port +default-apache-port+)
-			   (processor 'demo-apache-command-processor)
+(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 'apache-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))
+			   (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
 
-(let ((*number-server-requests* 0)
-      (*number-worker-requests* 0)
-      (*close-apache-socket* t))
-  
-  (defun apache-command-issuer (*apache-socket* processor &rest args)
-    "generates commands from apache, issues commands to processor-fun"
-    (unwind-protect
-	 (progn
-	   (setq *number-worker-requests* 0)
-	   (do ((command (read-apache-command) (read-apache-command)))
+(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)
+	       (*ml-server* server))
+	   (do ((command (read-modlisp-command) (read-modlisp-command)))
 	       ((null command))
-	     (apply processor command args)
-	     (force-output *apache-socket*)
+	     (apply (processor server) command (processor-args server))
+	     (finish-output *modlisp-socket*)
 	     (incf *number-worker-requests*)
 	     (incf *number-server-requests*)
-	     (when *close-apache-socket*
-	       (return))))
-      (close-active-socket *apache-socket*)))
-  
-
-  (defun get-number-worker-requests ()
-    *number-worker-requests*)
-
-  (defun get-number-server-requests ()
-    *number-server-requests*)
-  
-  (defun set-close-apache-socket (close?)
-    (setq *close-apache-socket* close?))
+	     (when *close-modlisp-socket*
+	       (return)))))
+    (close-active-socket *modlisp-socket*)))
   
-  ) ;; closure
-
 (defun header-value (header key)
-  (cdr (assoc key header :test #'string=)))
+  "Returns the value of a modlisp header"
+  (cdr (assoc key header :test #'eq)))
 
-(defun read-apache-command ()
+(defun read-modlisp-command ()
   (ignore-errors
-    (let* ((header (read-apache-header))
-	   (content-length (header-value header "content-length"))
+    (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 *apache-socket*)
-       (push (cons "posted-content" content) header))
-     header)))
+	  (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-apache-line ()
-  (kmrcl:string-left-trim-one-char  #\return
-				    (read-line *apache-socket* nil nil)))
 
-(defun read-apache-header ()
-  (loop for key = (read-apache-line)
+(defun read-modlisp-header ()
+  (loop for key = (read-modlisp-line)
       while (and key
 		 (string-not-equal key "end")
 		 (> (length key) 1))
-      for value = (read-apache-line)
-      collect (cons key value)))
+      for value = (read-modlisp-line)
+      collect (cons (ensure-keyword key) value)))
 
 (defun write-header-line (key value)
-  (write-string key *apache-socket*)
-  (write-char #\NewLine *apache-socket*)
-  (write-string value *apache-socket*)
-  (write-char #\NewLine *apache-socket*))
+  (write-string (string key) *modlisp-socket*)
+  (write-char #\NewLine *modlisp-socket*)
+  (write-string value *modlisp-socket*)
+  (write-char #\NewLine *modlisp-socket*))