-
-(defmacro with-ml-page ((&key (format :html) (precompute t)) &body body)
- (let ((fmt (gensym))
- (precomp (gensym))
- (result (gensym))
- (outstr (gensym))
- (stream (gensym)))
- `(let ((,fmt ,format)
- (,precomp ,precompute)
- ,result ,outstr)
- (write-header-line "Status" "200 OK")
- (write-header-line "Content-Type" (format-string ,fmt))
- (unless ,precomp
- (write-string "end" *modlisp-socket*)
- (write-char #\NewLine *modlisp-socket*))
- (setq ,outstr
- (with-output-to-string (,stream)
- (let ((*modlisp-socket* (if ,precomp
- ,stream
- *modlisp-socket*)))
- (setq ,result (progn ,@body)))))
- (cond
- (,precomp
- (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" *modlisp-socket*)
- (write-char #\NewLine *modlisp-socket*)
- (write-string ,outstr *modlisp-socket*)
- (finish-output *modlisp-socket*)
- (setq *close-modlisp-socket* nil))
- (t
- (setq *close-modlisp-socket* t)
- (finish-output *modlisp-socket*)))
- ,result)))
+
+(defun format-string (fmt headers)
+ `(("Content-Type" .
+ ,(format->string fmt))
+ . ,headers))
+
+(defmacro write-response ((&key headers len (status "200 OK")) &body body)
+ (let ((result (gensym "RES-")))
+ `(progn
+ (write-header-line "Status" ,status)
+ (dolist (hdr ,headers)
+ (write-header-line (car hdr) (cdr hdr)))
+ ,@(and len
+ `((write-header-line "Content-Length" ,len)
+ (write-header-line "Keep-Socket" "1")
+ (write-header-line "Connection" "Keep-Alive")))
+ (write-string "end" *modlisp-socket*)
+ (write-char #\NewLine *modlisp-socket*)
+ (let ((,result (progn ,@body)))
+ (,(if len 'force-output 'finish-output) *modlisp-socket*)
+ (setq *close-modlisp-socket* ,(not len))
+ ,result))))
+
+(defmacro with-ml-page ((&key (format :html) (precompute t) headers)
+ &body body)
+ (if precompute
+ `(output-ml-page ,format (with-output-to-string (*modlisp-socket*) ,@body) :headers ,headers)
+ `(write-response (:headers (format-string ,format ,headers)) ,@body)))