upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-05-28 04:34:11 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #782 from letsencrypt/fix_781

Browse source 
fix #781
This commit is contained in:
James Kasten 2015-09-17 14:17:17 -04:00
commit 5e8f311190
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
letsencrypt-apache/letsencrypt_apache/parser.py
View file

@ -394,6 +394,8 @@ class ApacheParser(object):
if not arg.startswith("/"):
# Normpath will condense ../
arg = os.path.normpath(os.path.join(self.root, arg))
else:
arg = os.path.normpath(arg)
# Attempts to add a transform to the file if one does not already exist
if os.path.isdir(arg):

3
letsencrypt-apache/letsencrypt_apache/tests/complex_parsing_test.py
View file

@ -98,6 +98,9 @@ class ComplexParserTest(util.ParserTest):
def test_include_fullpath(self):
self.verify_fnmatch(os.path.join(self.config_path, "test_fnmatch.conf"))
def test_include_fullpath_trailing_slash(self):
self.verify_fnmatch(self.config_path + "//")
def test_include_variable(self):
self.verify_fnmatch("../complex_parsing/${fnmatch_filename}")