Pass the $@ array and not the flattened version of it in non-SysV mode:

$ bash -x bin/apachectl -t -c "foo bar"
before: +bin/httpd -t -c foo bar
after:  +bin/httpd -t -c 'foo bar'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@767994 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 71f30f8c104fa9abc4f90981a0ee2a723d2968b4..f9e0fa4aa81dfa582d95970a2ba5ebb387073cdb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@ Changes with Apache 2.3.3
      mod_proxy_ajp: Avoid delivering content from a previous request which
      failed to send a request body. PR 46949 [Ruediger Pluem]
 
+  *) apachectl: When passing through arguments to httpd in
+     non-SysV mode, use the "$@" syntax to preserve arguments.
+     [Eric Covener]
+
   *) mod_dbd: add DBDInitSQL directive to enable SQL statements to
      be run when a connection is opened.  PR 46827
      [Marko Kevac <mkevac gmail.com>]

diff --git a/support/apachectl.in b/support/apachectl.in
index 0bb7ce5e49ae0e545d6088198133a58bea19ed96..3281c2e6cd1c927b9b1832578536de9fdc516033 100644 (file)
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -98,7 +98,7 @@ fullstatus)
     $LYNX $STATUSURL
     ;;
 *)
-    $HTTPD $ARGV
+    $HTTPD "$@"
     ERROR=$?
 esac