[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] 02/12: ws-in-directory-p parent should be expanded
From: |
Eric Schulte |
Subject: |
[elpa] 02/12: ws-in-directory-p parent should be expanded |
Date: |
Wed, 07 May 2014 03:10:58 +0000 |
eschulte pushed a commit to branch master
in repository elpa.
commit 4c117e41cb6a9e9582cd956f53034b049b07f5a1
Author: Eric Schulte <address@hidden>
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)))
- [elpa] branch master updated (2d2431c -> 37fc443), Eric Schulte, 2014/05/06
- [elpa] 02/12: ws-in-directory-p parent should be expanded,
Eric Schulte <=
- [elpa] 08/12: don't assume temporary file directory name, Eric Schulte, 2014/05/06
- [elpa] 03/12: Corrected example in ws-start docstring, Eric Schulte, 2014/05/06
- [elpa] 04/12: Merge pull request #3 from thesoftwarebin/master, Eric Schulte, 2014/05/06
- [elpa] 05/12: remove coding conversion from main network process, Eric Schulte, 2014/05/06
- [elpa] 06/12: pass the silent flag to curl for all request types, Eric Schulte, 2014/05/06
- [elpa] 09/12: increasingly windows robustness of tests, Eric Schulte, 2014/05/06
- [elpa] 07/12: TODO pass all tests on Windows [0/2], Eric Schulte, 2014/05/06
- [elpa] 10/12: passing all tests on Windows, Eric Schulte, 2014/05/06
- [elpa] 12/12: Merge commit 'aecfbcbc10cf03ec94062ac3e590f8118e5a0434', Eric Schulte, 2014/05/06
- [elpa] 01/12: Fix up copyright headers., Eric Schulte, 2014/05/06