[Pkg-apache-commits] r996 - in /trunk/apache2: a2enmod changelog
sf at alioth.debian.org
sf at alioth.debian.org
Sun Jul 26 19:45:45 UTC 2009
Author: sf
Date: Sun Jul 26 19:45:42 2009
New Revision: 996
URL: http://svn.debian.org/wsvn/pkg-apache/?sc=1&rev=996
Log:
Make a2ensite and friends ignore the same filenames as apache does for
included config files.
Modified:
trunk/apache2/a2enmod
trunk/apache2/changelog
Modified: trunk/apache2/a2enmod
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/a2enmod?rev=996&op=diff
==============================================================================
--- trunk/apache2/a2enmod (original)
+++ trunk/apache2/a2enmod Sun Jul 26 19:45:42 2009
@@ -30,6 +30,7 @@
? "$ENV{APACHE_CONFDIR}/envvars"
: "/etc/apache2$dir_suffix/envvars"
);
+$ENV{LANG}='C';
read_env_file($env_file);
$act .= 'able';
@@ -101,7 +102,7 @@
} glob("$choicedir/$arg$sffx");
# use same rules as apache's Include directive
- @glob = grep( /^[A-Za-z0-9][-.\w]*$/, @glob );
+ @glob = grep( /^[[:alnum:]][-._[:alnum:]]*$/, @glob );
@glob = grep( !/\.dpkg/, @glob );
return @glob;
Modified: trunk/apache2/changelog
URL: http://svn.debian.org/wsvn/pkg-apache/trunk/apache2/changelog?rev=996&op=diff
==============================================================================
--- trunk/apache2/changelog (original)
+++ trunk/apache2/changelog Sun Jul 26 19:45:42 2009
@@ -1,6 +1,8 @@
apache2 (2.2.11-8) UNRELEASED; urgency=low
* Enable hardening compile options.
+ * Make a2ensite and friends ignore the same filenames as apache does for
+ included config files.
* Remove 2.0 -> 2.2 upgrade logic from maintainer scripts.
* Remove other_vhosts_access.log on package purge.
More information about the Pkg-apache-commits
mailing list