[Portableaserve-cvslog] CVS: portableaserve/aserve main.cl,1.11,1.12

[Jochen S. <neo...@us...>]

Update of /cvsroot/portableaserve/portableaserve/aserve
In directory usw-pr-cvs1:/tmp/cvs-serv29113/aserve

Modified Files:
	main.cl 
Log Message:
Fixed bug with multiple servers. (ACLs initial special bindings for MP)


Index: main.cl
===================================================================
RCS file: /cvsroot/portableaserve/portableaserve/aserve/main.cl,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -w -r1.11 -r1.12
--- main.cl	2002/01/03 13:17:29	1.11
+++ main.cl	2002/01/11 16:21:38	1.12
@@ -146,7 +146,7 @@
 
 (in-package :net.aserve)
 
-(defparameter *aserve-version* '(1 2 12 :a))
+(defparameter *aserve-version* '(1 2 12 :b))
 
 #+allegro
 (eval-when (eval load)
@@ -1257,17 +1257,18 @@
 	       `((*wserver*  . ',*wserver*)
 		 #+ignore (*debug-io* . ',(wserver-terminal-io *wserver*))
 		 ,@excl:*cl-default-special-bindings*))
-	 #'http-accept-thread)
+	 #'http-accept-thread
+         *wserver*)
 
 	#-allegro
 	(mp:process-run-function (format nil "aserve-accept-~d" (incf *thread-index*))
-				 nil #'http-accept-thread)))
+				 nil #'http-accept-thread *wserver*)))
 
 (defun make-worker-thread ()
   (mp:without-scheduling
    (let* ((name (format nil "~d-aserve-worker" (incf *thread-index*)))
 	  (proc #-allegro
-		(mp:process-run-function name nil #'http-worker-thread)
+		(mp:process-run-function name nil #'http-worker-thread *wserver*)
 		#+allegro
 		(mp:make-process :name name
 				 :initial-bindings
@@ -1277,7 +1278,7 @@
 				   ,@excl:*cl-default-special-bindings*)
 				 )))
      #+allegro
-     (mp:process-preset proc #'http-worker-thread)
+     (mp:process-preset proc #'http-worker-thread *wserver*)
      #-allegro
      (setf (mp:process-run-reasons proc) nil)
 
@@ -1289,9 +1290,10 @@
      )))
 
 
-(defun http-worker-thread ()
+(defun http-worker-thread (server)
   ;; made runnable when there is an socket on which work is to be done
   (let ((*print-level* 5)
+        (*wserver* server)
         (*worker-request* nil)
 	(*default-aserve-external-format* 
 	 (wserver-external-format *wserver*))
@@ -1327,13 +1329,13 @@
     
       )))
 
-(defun http-accept-thread ()
+(defun http-accept-thread (server)
   ;; loop doing accepts and processing them
   ;; ignore sporatic errors but stop if we get a few consecutive ones
   ;; since that means things probably aren't going to get better.
   (let* ((error-count 0)
 	 (workers nil)
-	 (server *wserver*)
+	 (*wserver* server)
 	 (main-socket (wserver-socket server))
 	 (ipaddrs (wserver-ipaddrs server)))
     (unwind-protect