Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

run-reasons fix

  • Loading branch information...
commit b121f7022a7e4c9fc0751a67a4fb46f1823482bd 1 parent b9c4f0a
jkf authored
Showing with 14 additions and 2 deletions.
  1. +6 −0 ChangeLog
  2. +8 −2 main.cl
View
6 ChangeLog
@@ -1,3 +1,9 @@
+2004-04-29 John Foderaro <jkf@tiger.franz.com>
+
+ * main.cl - http-worker-thread don't expect the stream
+ to process to be the first and only thing on the
+ run-reasons list. Acl7.0 will add things as well.
+
2004-03-04 John Foderaro <jkf@tiger.franz.com>
* main.cl - ensure that get-request-body always reads from
View
10 main.cl
@@ -24,7 +24,7 @@
;; Suite 330, Boston, MA 02111-1307 USA
;;
;;
-;; $Id: main.cl,v 1.159 2004/03/04 21:52:38 jkf Exp $
+;; $Id: main.cl,v 1.160 2004/04/29 22:33:42 jkf Exp $
;; Description:
;; aserve's main loop
@@ -1171,7 +1171,13 @@ by keyword symbols and not by strings"
;; need to restrict the print level
(loop
- (let ((sock (car (mp:process-run-reasons sys:*current-process*))))
+ (let ((sock (dolist (rr (mp:process-run-reasons sys:*current-process*))
+ (if* (streamp rr) then (return rr)))))
+ (if* (null sock)
+ then ; started without a stream to process, must be because
+ ;; we're being told to die, so abandon thread
+ (return-from http-worker-thread nil))
+
(restart-case
(if* (not (member :notrap *debug-current* :test #'eq))
then (handler-case (process-connection sock)
Please sign in to comment.
Something went wrong with that request. Please try again.