- fix cosmetic issues in "service httpd reload"httpd-2_0_52-7

- move User/Group higher in httpd.conf (#146793)
- load mod_logio by default in httpd.conf
- apachectl: update for correct libselinux tools locations

3 files changed, 24 insertions, 17 deletions

diff --git a/httpd.conf b/httpd.conf
index cabf318..0b49d38 100644
--- a/httpd.conf
+++ b/httpd.conf
@@ -187,6 +187,7 @@ LoadModule disk_cache_module modules/mod_disk_cache.so
 LoadModule file_cache_module modules/mod_file_cache.so
 LoadModule mem_cache_module modules/mod_mem_cache.so
 LoadModule cgi_module modules/mod_cgi.so
+LoadModule logio_module modules/mod_logio.so
 
 #
 # Load config files from the config directory "/etc/httpd/conf.d".
@@ -200,18 +201,6 @@ Include conf.d/*.conf
 #
 #ExtendedStatus On
 
-### Section 2: 'Main' server configuration
-#
-# The directives in this section set up the values used by the 'main'
-# server, which responds to any requests that aren't handled by a
-# <VirtualHost> definition.  These values also provide defaults for
-# any <VirtualHost> containers you may define later in the file.
-#
-# All of these directives may appear inside <VirtualHost> containers,
-# in which case these default settings will be overridden for the
-# virtual host being defined.
-#
-
 #
 # If you wish httpd to run as a different user or group, you must run
 # httpd as root initially and it will switch.  
@@ -227,6 +216,18 @@ Include conf.d/*.conf
 User apache
 Group apache
 
+### Section 2: 'Main' server configuration
+#
+# The directives in this section set up the values used by the 'main'
+# server, which responds to any requests that aren't handled by a
+# <VirtualHost> definition.  These values also provide defaults for
+# any <VirtualHost> containers you may define later in the file.
+#
+# All of these directives may appear inside <VirtualHost> containers,
+# in which case these default settings will be overridden for the
+# virtual host being defined.
+#
+
 #
 # ServerAdmin: Your address, where problems with the server should be
 # e-mailed.  This address appears on some server-generated pages, such
diff --git a/httpd.init b/httpd.init
index 0624e06..40e63fb 100755
--- a/httpd.init
+++ b/httpd.init
@@ -73,15 +73,15 @@ stop() {
 	[ $RETVAL = 0 ] && rm -f ${lockfile} ${pidfile}
 }
 reload() {
-    if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t; then
-        failure $"Configuration syntax check for $httpd, will not reload"
+    echo -n $"Reloading $prog: "
+    if ! LANG=$HTTPD_LANG $httpd $OPTIONS -t >&/dev/null; then
         RETVAL=$?
+        failure $"not reloading $httpd due to configuration syntax error"
     else
-        echo -n $"Reloading $prog: "
         killproc $httpd -HUP
         RETVAL=$?
-        echo
     fi
+    echo
 }
 
 # See how we were called.
diff --git a/httpd.spec b/httpd.spec
index c9733eb..a01e7d9 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -7,7 +7,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.0.52
-Release: 6
+Release: 7
 URL: http://httpd.apache.org/
 Source0: http://www.apache.org/dist/httpd/httpd-%{version}.tar.gz
 Source1: index.html
@@ -604,6 +604,12 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/suexec.8*
 
 %changelog
+* Mon Feb  7 2005 Joe Orton <jorton@redhat.com> 2.0.52-7
+- fix cosmetic issues in "service httpd reload"
+- move User/Group higher in httpd.conf (#146793)
+- load mod_logio by default in httpd.conf
+- apachectl: update for correct libselinux tools locations
+
 * Tue Nov 16 2004 Joe Orton <jorton@redhat.com> 2.0.52-6
 - add security fix for CVE CAN-2004-0942 (memory consumption DoS)
 - SELinux: run httpd -t under runcon in configtest (Steven Smalley)