rpms/httpd/devel httpd.spec,1.120,1.121 httpd.conf,1.25,1.26

[Joe Orton (jorton)]

Author: jorton

Update of /cvs/extras/rpms/httpd/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24023

Modified Files:
	httpd.spec httpd.conf 
Log Message:
* Wed Jun  4 2008 Joe Orton <jorton at redhat.com> 2.2.8-4
- correct UserDir directive in default config (#449815)



Index: httpd.spec
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.spec,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- httpd.spec	19 Feb 2008 07:05:36 -0000	1.120
+++ httpd.spec	4 Jun 2008 11:33:29 -0000	1.121
@@ -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 @@
 %{_libdir}/httpd/build/*.sh
 
 %changelog
+* Wed Jun  4 2008 Joe Orton <jorton at redhat.com> 2.2.8-4
+- correct UserDir directive in default config (#449815)
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 2.2.8-3
 - Autorebuild for GCC 4.3
 


Index: httpd.conf
===================================================================
RCS file: /cvs/extras/rpms/httpd/devel/httpd.conf,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -r1.25 -r1.26
--- httpd.conf	17 Sep 2007 19:02:35 -0000	1.25
+++ httpd.conf	4 Jun 2008 11:33:29 -0000	1.26
@@ -351,11 +351,11 @@
     # 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