public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Lars Wendler" <polynomial-c@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/apache:master commit in: 2.4/init/
Date: Thu,  3 Mar 2016 13:03:17 +0000 (UTC)	[thread overview]
Message-ID: <1457009186.c8ea8dca5e71073426ad3766377cf950c9ef815b.polynomial-c@gentoo> (raw)

commit:     c8ea8dca5e71073426ad3766377cf950c9ef815b
Author:     Michael Orlitzky <mjo <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 21 15:40:33 2016 +0000
Commit:     Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar  3 12:46:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/apache.git/commit/?id=c8ea8dca

apache2.initd: append SERVERROOT and CONFIGFILE to APACHE2_OPTS once.

We are currently appending both SERVERROOT and CONFIGFILE to
APACHE2_OPTS in the checkconfd() function. Since checkconfd() is
called multiple times, this can lead to duplication of command-line
arguments as witnessed in bug 566726. Since the values of SERVERROOT
and CONFIGFILE are fixed, we now instead append them once at the
beginning of the script.

Gentoo-Bug: 566726

 2.4/init/apache2.initd | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/2.4/init/apache2.initd b/2.4/init/apache2.initd
index 6320f1a..e81fa59 100755
--- a/2.4/init/apache2.initd
+++ b/2.4/init/apache2.initd
@@ -22,6 +22,11 @@ SERVERROOT="${SERVERROOT:-/usr/lib/apache2}"
 CONFIGFILE="${CONFIGFILE:-/etc/apache2/httpd.conf}"
 RELOAD_TYPE="${RELOAD_TYPE:-graceful}"
 
+# Append the server root and configuration file parameters to the
+# user's APACHE2_OPTS.
+APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
+APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
+
 # The path to the apache2 binary.
 APACHE2="/usr/sbin/apache2"
 
@@ -42,9 +47,6 @@ checkconfd() {
 		eerror "SERVERROOT does not exist: ${SERVERROOT}"
 		return 1
 	fi
-
-	APACHE2_OPTS="${APACHE2_OPTS} -d ${SERVERROOT}"
-	APACHE2_OPTS="${APACHE2_OPTS} -f ${CONFIGFILE}"
 }
 
 checkconfig() {


             reply	other threads:[~2016-03-03 13:03 UTC|newest]

Thread overview: 22+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-03 13:03 Lars Wendler [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-02-23 10:19 [gentoo-commits] proj/apache:master commit in: 2.4/init/ Hans de Graaff
2023-09-03  7:40 Hans de Graaff
2020-12-30  1:46 Lars Wendler
2020-12-30  1:32 Lars Wendler
2020-12-03 16:06 Lars Wendler
2020-12-02 11:43 Lars Wendler
2020-12-01 12:35 Lars Wendler
2020-12-01 12:19 Lars Wendler
2018-03-23 16:22 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2016-03-03 13:03 Lars Wendler
2014-05-14 13:56 Lars Wendler

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1457009186.c8ea8dca5e71073426ad3766377cf950c9ef815b.polynomial-c@gentoo \
    --to=polynomial-c@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox