summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjorton <jorton@fedoraproject.org>2008-06-04 11:33:29 +0000
committerjorton <jorton@fedoraproject.org>2008-06-04 11:33:29 +0000
commit0a6d82dc328e04d203b7b06bc837f83b87c424e7 (patch)
tree29056f9b8318b56059bd2e1a42379d0d186dfb98
parent9aea0b611d97ede919ece6a6011959e07572a197 (diff)
downloadhttpd-0a6d82dc328e04d203b7b06bc837f83b87c424e7.tar.gz
httpd-0a6d82dc328e04d203b7b06bc837f83b87c424e7.tar.xz
httpd-0a6d82dc328e04d203b7b06bc837f83b87c424e7.zip
- correct UserDir directive in default config (#449815)
-rw-r--r--httpd.conf4
-rw-r--r--httpd.spec5
2 files changed, 6 insertions, 3 deletions
diff --git a/httpd.conf b/httpd.conf
index a057e7b..0a1235d 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -351,11 +351,11 @@ DocumentRoot "/var/www/html"
# of a username on the system (depending on home directory
# permissions).
#
- UserDir disable
+ UserDir disabled
#
# To enable requests to /~user/ to serve the user's public_html
- # directory, remove the "UserDir disable" line above, and uncomment
+ # directory, remove the "UserDir disabled" line above, and uncomment
# the following line instead:
#
#UserDir public_html
diff --git a/httpd.spec b/httpd.spec
index a5a21f3..731f241 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -6,7 +6,7 @@
Summary: Apache HTTP Server
Name: httpd
Version: 2.2.8
-Release: 3
+Release: 4
URL: http://httpd.apache.org/
Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
Source1: index.html
@@ -475,6 +475,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/httpd/build/*.sh
%changelog
+* Wed Jun 4 2008 Joe Orton <jorton@redhat.com> 2.2.8-4
+- correct UserDir directive in default config (#449815)
+
* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 2.2.8-3
- Autorebuild for GCC 4.3