Changeset 12024 in project

Timestamp:

09/28/08 18:44:19 (13 years ago)

Author:

sjamaan

Message:

Make filename handling work the same way directory handling works

File:

• release/4/spiffy/trunk/spiffy.scm (modified) (3 diffs)

release/4/spiffy/trunk/spiffy.scm

@@ -101 +101 @@
 (define request-restarter (make-parameter #f))
 
+;; A simple utility procedure to render a status code with message
 (define (send-status code reason #!optional text)
   (parameterize ((current-response (update-response (current-response)
@@ -124 +125 @@
 
 (define (send-static-file filename)
-  (with-headers `((content-length ,(file-size filename)))
-    (lambda ()
-      (write-response (current-response))
-      (let ([fd (file-open filename (+ open/binary open/rdonly))])
-              (handle-exceptions exn (begin
-                                       (file-close fd)
-                                       (signal exn))
-                (sendfile fd (response-port (current-response))))
-              (file-close fd)))))
+  (let ((path (make-pathname (root-path) filename)))
+    (with-headers `((content-length ,(file-size path)))
+      (lambda ()
+        (write-response (current-response))
+        (let ([fd (file-open path (+ open/binary open/rdonly))])
+          (handle-exceptions exn (begin
+                                   (file-close fd)
+                                   (signal exn))
+                             (sendfile fd (response-port (current-response))))
+          (file-close fd))))))
 
 (define (extension->mime-type ext)
@@ -176 +178 @@
                              (cdr remaining-path)))))
      ((file-exists? path)
-      ((handle-file) path))
+      ((handle-file) current-path))
      (else ((handle-not-found))))))