Loosen the core's dependency on Hunchentoot.

1 files changed, 28 insertions, 5 deletions

diff --git a/mulkcms-hunchentoot.lisp b/mulkcms-hunchentoot.lisp
index c5fa908..762d181 100755..100644
--- a/mulkcms-hunchentoot.lisp
+++ b/mulkcms-hunchentoot.lisp
@@ -17,11 +17,34 @@
 (defun dispatch-mulkcms-request (request)
   (let* ((relative-path (subseq (script-name request) 1))
          (mulkcms::*use-ssl-p* (equal (header-in* :x-use-ssl)
-                                      "true")))
-    (mulkcms::find-request-handler relative-path
-                                   (append (get-parameters*)
-                                           (post-parameters*))
-                                   (header-in* :accept-language))))
+                                      "true"))
+         (mulkcms::*real-remote-addr*
+          (hunchentoot:real-remote-addr))
+         (mulkcms::*user-agent*
+          (hunchentoot:user-agent))
+         (mulkcms::*request-method*
+          (hunchentoot:request-method*))
+         (mulkcms::*headers*
+          (hunchentoot::headers-in*)))
+    (let ((result (mulkcms::find-request-handler relative-path
+                                                 (append (get-parameters*)
+                                                         (post-parameters*))
+                                                 (header-in* :accept-language))))
+      (typecase result
+        (cons
+         (when-let (content-type (getf result :content-type))
+           (setf (hunchentoot:content-type*) content-type))
+         (when-let (headers (getf result :headers))
+           (dolist (header headers)
+             (setf (hunchentoot:header-out (car header))
+                   (cdr header))))
+         (when-let (return-code (getf result :return-code))
+           (setf (hunchentoot:return-code*) return-code)
+           ;;(hunchentoot:abort-request-handler)
+           )
+         (getf result :body))
+        (t
+         result)))))
 
 (defun setup-handlers ()
   (setq *dispatch-table*