summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Covener <covener@apache.org>2009-04-23 19:45:41 +0200
committerEric Covener <covener@apache.org>2009-04-23 19:45:41 +0200
commit49c61ba5bc93790c4b6dea424f04dc8fa3affff5 (patch)
tree181a91400e18ec47c3be127e12f28e139b8bd577
parentupdate transformation (diff)
downloadapache2-49c61ba5bc93790c4b6dea424f04dc8fa3affff5.tar.xz
apache2-49c61ba5bc93790c4b6dea424f04dc8fa3affff5.zip
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
-rw-r--r--CHANGES4
-rw-r--r--support/apachectl.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/CHANGES b/CHANGES
index 71f30f8c10..f9e0fa4aa8 100644
--- 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 0bb7ce5e49..3281c2e6cd 100644
--- a/support/apachectl.in
+++ b/support/apachectl.in
@@ -98,7 +98,7 @@ fullstatus)
$LYNX $STATUSURL
;;
*)
- $HTTPD $ARGV
+ $HTTPD "$@"
ERROR=$?
esac