r5254: Auto commit for Debian build

[cl-modlisp.git] / utils.lisp

diff --git a/utils.lisp b/utils.lisp
index 04376fdd43dcb018ebb66e3c30d1078e2c259414..9964122fd2323b4bca740a717b98955b98103eb5 100644 (file)
--- a/utils.lisp
+++ b/utils.lisp
@@ -7,7 +7,7 @@
 ;;;; Programmer:    Kevin M. Rosenberg
 ;;;; Date Started:  Dec 2002
 ;;;;
-;;;; $Id: utils.lisp,v 1.1 2003/07/04 19:52:32 kevin Exp $
+;;;; $Id: utils.lisp,v 1.4 2003/07/08 08:34:23 kevin Exp $
 ;;;; *************************************************************************
 
 (in-package #:modlisp)
@@ -41,32 +41,38 @@
             (setq ,result (progn ,@body)))))
        (cond
        (,precomp
-        (write-header-line "Content-Length" (write-to-string (length ,outstr)))
+        (write-header-line "Content-Length" 
+                           (write-to-string (length ,outstr)))
         (write-header-line "Keep-Socket" "1")
+        (write-header-line "Keep-Alive" "timeout=15, max=99")
+        (write-header-line "Connection" "Keep-Alive")
         (write-string "end" *apache-socket*)
         (write-char #\NewLine *apache-socket*)
         (write-string ,outstr *apache-socket*)
-        (setq *close-apache-socket* nil))
+        (force-output *apache-socket*)
+        (set-close-apache-socket nil))
        (t
-        (finish-output *apache-socket*)
-        (setq *close-apache-socket* t)))
+        (set-close-apache-socket t)
+        (finish-output *apache-socket*)))
        ,result)))
 
 (defun redirect-to-location (url)
   (write-header-line "Status" "302 Redirect")
   (write-header-line "Location" url)
   (write-char #\NewLine *apache-socket*)
-  (setq *close-apache-socket* t))
+  (set-close-apache-socket t))
 
 (defun output-ml-page (format html)
   (write-header-line "Status" "200 OK")
   (write-header-line "Content-Type" (format-string format))
   (write-header-line "Content-Length" (format nil "~d" (length html)))
   (write-header-line "Keep-Socket" "1")
+  (write-header-line "Keep-Alive" "timeout=15, max=99")
+  (write-header-line "Connection" "Keep-Alive")
   (write-string "end" *apache-socket*)
   (write-char #\NewLine *apache-socket*)
   (write-string html *apache-socket*)
-  (setq *close-apache-socket* nil))
+  (set-close-apache-socket nil))
 
 (defun output-html-page (str)
   (output-ml-page :html str))
@@ -84,6 +90,10 @@
          (when (= 2 (length name-val-list))
            (destructuring-bind (name val) name-val-list
              (push (cons (kmrcl:ensure-keyword name)
-                         (decode-uri-query-string val))
+                         (kmrcl:decode-uri-query-string val))
                    alist))))))))
 
+
+
+
+