summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Fritsch <sf@debian.org>2008-09-04 16:38:11 +0000
committerStefan Fritsch <sf@sfritsch.de>2012-01-02 10:36:57 +0100
commit1cb3197dd8f18546473cf466542ef8a49b69e746 (patch)
treef5f4e47d37706f6ea741686c0309d16c61603ffc
parent94990b063ef5e4d095770099716f3486ba9bfa65 (diff)
downloadapache2-1cb3197dd8f18546473cf466542ef8a49b69e746.tar.gz
Specify DocumentRoot withouth trailing slash
git-svn-id: svn+ssh://svn.debian.org/svn/pkg-apache/trunk/apache2@806 01b336ce-410b-0410-9a02-a0e7f243c266
-rw-r--r--debian/changelog1
-rw-r--r--debian/config-dir/sites-available/default2
-rw-r--r--debian/config-dir/sites-available/default-ssl2
3 files changed, 3 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index 3934481a..0181170e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ apache2 (2.2.9-8) UNRELEASED; urgency=low
* Correct description of ServerTokens in /etc/apache2/conf.d/security.
(Closes: #497362)
+ * Specify DocumentRoot withouth trailing slash. (Closes: #495110)
-- Stefan Fritsch <sf@debian.org> Thu, 04 Sep 2008 18:34:48 +0200
diff --git a/debian/config-dir/sites-available/default b/debian/config-dir/sites-available/default
index 2cbd90fe..7f48ee98 100644
--- a/debian/config-dir/sites-available/default
+++ b/debian/config-dir/sites-available/default
@@ -1,7 +1,7 @@
<VirtualHost *:80>
ServerAdmin webmaster@localhost
- DocumentRoot /var/www/
+ DocumentRoot /var/www
<Directory />
Options FollowSymLinks
AllowOverride None
diff --git a/debian/config-dir/sites-available/default-ssl b/debian/config-dir/sites-available/default-ssl
index 870215c9..6259544b 100644
--- a/debian/config-dir/sites-available/default-ssl
+++ b/debian/config-dir/sites-available/default-ssl
@@ -2,7 +2,7 @@
<VirtualHost _default_:443>
ServerAdmin webmaster@localhost
- DocumentRoot /var/www/
+ DocumentRoot /var/www
<Directory />
Options FollowSymLinks
AllowOverride None