eschulte pushed a commit to branch master
in repository elpa.
commit 4c117e41cb6a9e9582cd956f53034b049b07f5a1
Author: Eric Schulte <schulte.e...@gmail.com>
Date: Sun Apr 13 09:39:38 2014 -0600
ws-in-directory-p parent should be expanded
We don't want to re-expand this variable every time a file is served.
---
web-server.el | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/web-server.el b/web-server.el
index 148c983..df920af 100644
--- a/web-server.el
+++ b/web-server.el
@@ -658,7 +658,9 @@ used to limit the files sent."
(defun ws-in-directory-p (parent path)
"Check if PATH is under the PARENT directory.
-If so return PATH, if not return nil."
+If so return PATH, if not return nil. Note: the PARENT directory
+must be full expanded as with `expand-file-name' and should not
+contain e.g., \"~\" for a user home directory."
(if (zerop (length path))
parent
(let ((expanded (expand-file-name path parent)))
