Blame SOURCES/httpd-2.4.6-apachectl-httpd-env.patch

0943f8
diff --git a/docs/man/apachectl.8 b/docs/man/apachectl.8
0943f8
index 054550f..4bfc7cb 100644
0943f8
--- a/docs/man/apachectl.8
0943f8
+++ b/docs/man/apachectl.8
0943f8
@@ -77,7 +77,7 @@ status
0943f8
 Displays a brief status report\&. Similar to the fullstatus option, except that the list of requests currently being served is omitted\&.  
0943f8
 .TP
0943f8
 graceful
0943f8
-Gracefully restarts the Apache httpd daemon\&. If the daemon is not running, it is started\&. This differs from a normal restart in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This means that if used in a log rotation script, a substantial delay may be necessary to ensure that the old log files are closed before processing them\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure Apache doesn't die\&. This is equivalent to apachectl -k graceful\&.  
0943f8
+Gracefully restarts the Apache httpd daemon\&. If the daemon is not running, it is not started\&. This differs from a normal restart in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This means that if used in a log rotation script, a substantial delay may be necessary to ensure that the old log files are closed before processing them\&. This command automatically checks the configuration files as in configtest before initiating the restart to make sure Apache doesn't die\&. This is equivalent to apachectl -k graceful\&.  
0943f8
 .TP
0943f8
 graceful-stop
0943f8
 Gracefully stops the Apache httpd daemon\&. This differs from a normal stop in that currently open connections are not aborted\&. A side effect is that old log files will not be closed immediately\&. This is equivalent to apachectl -k graceful-stop\&.  
0943f8
diff --git a/support/apachectl.in b/support/apachectl.in
0943f8
index 2d59623..10fc280 100644
0943f8
--- a/support/apachectl.in
0943f8
+++ b/support/apachectl.in
0943f8
@@ -93,9 +93,9 @@ function testconfig() {
0943f8
 # httpd is denied terminal access in SELinux, so run in the
0943f8
 # current context to get stdout from $HTTPD -t.
0943f8
 if test -x /usr/sbin/selinuxenabled && /usr/sbin/selinuxenabled; then
0943f8
-  runcon -- `id -Z` $HTTPD $OPTIONS -t
0943f8
+  runcon -- `id -Z` /usr/sbin/httpd $OPTIONS -t
0943f8
 else
0943f8
-  $HTTPD $OPTIONS -t
0943f8
+  /usr/sbin/httpd $OPTIONS -t
0943f8
 fi
0943f8
 ERROR=$?
0943f8
 }
0943f8
@@ -134,7 +134,7 @@ fullstatus)
0943f8
     $LYNX $STATUSURL
0943f8
     ;;
0943f8
 *)
0943f8
-    $HTTPD $OPTIONS "$@"
0943f8
+    /usr/sbin/httpd $OPTIONS "$@"
0943f8
     ERROR=$?
0943f8
 esac
0943f8