From 0d70f66dd776cce80dab3f1a2a236e92bcfa77ce Mon Sep 17 00:00:00 2001 From: sperber Date: Sat, 8 Jun 2002 15:29:29 +0000 Subject: [PATCH] Revert to old representation of HTTP-URL:PATH. --- scheme/httpd/core.scm | 4 ++-- scheme/httpd/logging.scm | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scheme/httpd/core.scm b/scheme/httpd/core.scm index b56181b..da4cf8f 100644 --- a/scheme/httpd/core.scm +++ b/scheme/httpd/core.scm @@ -157,7 +157,7 @@ (parse-http-request sock options))) ; (1) Parse request. (handler (httpd-options-path-handler options))) - (handler (cdr (http-url:path (request:url req))) req) ; (2) Deal with it. (skip initial "/") + (handler (http-url:path (request:url req)) req) ; (2) Deal with it. (http-log req http-reply/ok)))) @@ -231,7 +231,7 @@ (make-http-url (make-userhost #f #f local-name (number->string portnum)) - (map unescape-uri path) ; DON'T Skip initial /. + (map unescape-uri (cdr path)) ; Skip initial /. search #f)) diff --git a/scheme/httpd/logging.scm b/scheme/httpd/logging.scm index 4021fe0..c8a3bcd 100644 --- a/scheme/httpd/logging.scm +++ b/scheme/httpd/logging.scm @@ -118,7 +118,7 @@ (format #f "~A - - ~A ~S ~A ~A ~S ~S~%" (or remote-ip "-") (format-date "[~d/~b/~Y:~H:~M:~S +0000]" (date)) ; +0000 as we don't know - (string-join (list request-type requested-file protocol)) + (string-join (list request-type "/" requested-file protocol)) ; Unfortunately, we first split the request line into ; method/request-type etc. and put it together here. ; Files conform to CLF are expected to print the original line.