diff options
| author | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-17 19:22:57 +0200 |
|---|---|---|
| committer | Hugo Hörnquist <hugo@lysator.liu.se> | 2020-08-17 19:22:57 +0200 |
| commit | 5b8c3a4af483deab668af3aff12f6f3d19556841 (patch) | |
| tree | dc4ac5d4d3f20e1886361cddcadcaf032907f399 | |
| parent | Split module/server into stuff. (diff) | |
| download | calp-5b8c3a4af483deab668af3aff12f6f3d19556841.tar.gz calp-5b8c3a4af483deab668af3aff12f6f3d19556841.tar.xz | |
fixes.
| -rw-r--r-- | module/calp/entry-points/server.scm | 2 | ||||
| -rw-r--r-- | module/calp/server/routes.scm | 2 | ||||
| -rw-r--r-- | module/calp/server/server.scm | 4 | ||||
| -rw-r--r-- | module/web/http/make-routes.scm (renamed from module/web/http/macro.scm) | 9 |
4 files changed, 9 insertions, 8 deletions
diff --git a/module/calp/entry-points/server.scm b/module/calp/entry-points/server.scm index 97397e5d..443892f3 100644 --- a/module/calp/entry-points/server.scm +++ b/module/calp/entry-points/server.scm @@ -8,7 +8,7 @@ :use-module (ice-9 getopt-long) ;; :use-module (ice-9 regex) #| regex here due to bad macros |# - :use-module ((server server) :select (start-server)) + :use-module ((calp server server) :select (start-server)) :export (main)) diff --git a/module/calp/server/routes.scm b/module/calp/server/routes.scm index afca2d7d..697f2e50 100644 --- a/module/calp/server/routes.scm +++ b/module/calp/server/routes.scm @@ -1,4 +1,4 @@ -(define-module (server routes) +(define-module (calp server routes) :use-module (util) :use-module (util options) :use-module (util exceptions) diff --git a/module/calp/server/server.scm b/module/calp/server/server.scm index 9c857b6d..1ad700f1 100644 --- a/module/calp/server/server.scm +++ b/module/calp/server/server.scm @@ -1,7 +1,7 @@ -(define-module (server server) +(define-module (calp server server) :use-module (util) :use-module (web server) - :use-module ((server routes) :select (make-make-routes)) + :use-module ((calp server routes) :select (make-make-routes)) :use-module (ice-9 threads)) ;; NOTE The default make-default-socket is broken for IPv6. diff --git a/module/web/http/macro.scm b/module/web/http/make-routes.scm index a0113f46..c725513d 100644 --- a/module/web/http/macro.scm +++ b/module/web/http/make-routes.scm @@ -89,7 +89,7 @@ (else (lambda* _ (return (build-response #:code 404) "404 Not Fonud")))) (append - (parse-query r:query) + ((@ (web query) parse-query) r:query) (let ((content-type (assoc-ref r:headers 'content-type))) (when content-type @@ -97,9 +97,10 @@ (args (cdr content-type))) (when (eq? type 'application/x-www-form-urlencoded) (let ((encoding (or (assoc-ref args 'encoding) "UTF-8"))) - (parse-query ((@ (ice-9 iconv) bytevector->string) - body encoding) - encoding))))))))))) + ((@ (web query) parse-query) + ((@ (ice-9 iconv) bytevector->string) + body encoding) + encoding))))))))))) (case-lambda ((headers body new-state) (values headers body new-state)) ((headers body) (values headers body state)) ((headers) (values headers "" state)))))))) |