diff --git a/scheme/httpd/core.scm b/scheme/httpd/core.scm index 5e9fe81..8cbd384 100644 --- a/scheme/httpd/core.scm +++ b/scheme/httpd/core.scm @@ -157,9 +157,12 @@ (decline)))) (lambda () (let* ((req (parse-http-request sock options)) - (response ((httpd-options-path-handler options) + (response + (with-current-input-port + (socket:inport sock) + ((httpd-options-path-handler options) (http-url:path (request:url req)) - req))) + req)))) (values req response))))) (lambda (req response) diff --git a/scheme/httpd/seval.scm b/scheme/httpd/seval.scm index a7388c8..35eb48a 100644 --- a/scheme/httpd/seval.scm +++ b/scheme/httpd/seval.scm @@ -134,7 +134,6 @@ (string-length cl-str))) 0)) ; All whitespace?? -- WTF. (qs (read-string cl)) ; Read in CL chars, - ;; FIXME where is the input port? (q (parse-html-form-query qs)) ; and parse them up. (s (cond ((assoc "program" q) => cdr) (else (signal 'seval-no-program))))) diff --git a/start-web-server b/start-web-server index d49ecc1..f742ed1 100755 --- a/start-web-server +++ b/start-web-server @@ -122,7 +122,7 @@ exec scsh -lm packages.scm -dm -o http-test -e main -s "$0" "$@" (with-path-handler (alist-path-dispatcher (list (cons "h" (home-dir-handler "public_html")) - (cons "seval" seval-handler) + (cons "seval" seval-handler) (cons "cgi-bin" (cgi-handler cgi-bin-dir))) (rooted-file-or-directory-handler htdocs-dir))))))))) )) diff --git a/web-server/root/htdocs/index2.html b/web-server/root/htdocs/index2.html index 0f7c312..911a606 100644 --- a/web-server/root/htdocs/index2.html +++ b/web-server/root/htdocs/index2.html @@ -8,6 +8,7 @@ Following files are available: