Avoid `with-parameters*' which creates a continuation barrier.

1 files changed, 17 insertions, 11 deletions

diff --git a/src/guile/cantius.scm b/src/guile/cantius.scm
index 36aafb7..bbe6c2c 100644
--- a/src/guile/cantius.scm
+++ b/src/guile/cantius.scm
@@ -659,17 +659,23 @@
                       (apply (endpoint-handler endpoint) request body
                              (or (and=> path-tail list) '()))))))))))
 
-    (with-parameters* (map car parameters) (map cdr parameters)
-      (lambda ()
-        (match ((compose list compute-response))
-          ((response-body)
-           (values (build-response*) response-body))
-          ((response response-body)
-           (values response response-body))
-          (something-else
-           (values (build-response* #:headers *%default-headers #:code 500)
-                   (format #f "Invalid return values from handler:~%~a"
-                           something-else))))))))
+    (let recurse ((parameters parameters))
+      (match parameters
+
+        (((param . value) . rest)
+         (parameterize ((param value))
+           (recurse rest)))
+
+        (()
+         (match ((compose list compute-response))
+           ((response-body)
+            (values (build-response*) response-body))
+           ((response response-body)
+            (values response response-body))
+           (something-else
+            (values (build-response* #:headers *%default-headers #:code 500)
+                    (format #f "Invalid return values from handler:~%~a"
+                            something-else)))))))))
 
 (define-public (run-cantius endset . server-args)
   (apply run-server (cut handler <> <> endset) server-args))