From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 1CE61138247 for ; Sat, 9 Nov 2013 15:33:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A0C4EE0A68; Sat, 9 Nov 2013 15:33:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B9043E0A68 for ; Sat, 9 Nov 2013 15:33:04 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF0B333F1B7 for ; Sat, 9 Nov 2013 15:33:03 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4326FE54C9 for ; Sat, 9 Nov 2013 15:33:01 +0000 (UTC) From: "Lars Wendler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Lars Wendler" Message-ID: <1316076955.0c73aa70400171c0ca352792e8e73e1015af13f3.polynomial-c@gentoo> Subject: [gentoo-commits] proj/apache:master commit in: 2.2/init/ X-VCS-Repository: proj/apache X-VCS-Files: 2.2/init/apache2.initd X-VCS-Directories: 2.2/init/ X-VCS-Committer: polynomial-c X-VCS-Committer-Name: Lars Wendler X-VCS-Revision: 0c73aa70400171c0ca352792e8e73e1015af13f3 X-VCS-Branch: master Date: Sat, 9 Nov 2013 15:33:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 59e68ed7-8bf8-4e31-8dda-0e5769af7195 X-Archives-Hash: 4b0445309271a960c29ae4a5c2082443 commit: 0c73aa70400171c0ca352792e8e73e1015af13f3 Author: Peter Volkov gentoo org> AuthorDate: Thu Sep 15 08:55:55 2011 +0000 Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 15 08:55:55 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/apache.git;a=commit;h=0c73aa70 Use start-stop-daemon to use system limits for apache. Fixes bug #347301 by Diego Elio Pettenò. --- 2.2/init/apache2.initd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/2.2/init/apache2.initd b/2.2/init/apache2.initd index df7374e..66f1c73 100755 --- a/2.2/init/apache2.initd +++ b/2.2/init/apache2.initd @@ -69,7 +69,7 @@ start() { [ -f /var/log/apache2/ssl_scache ] && rm /var/log/apache2/ssl_scache ebegin "Starting ${SVCNAME}" - ${APACHE2} ${APACHE2_OPTS} -k start + start-stop-daemon --start -- ${APACHE2} ${APACHE2_OPTS} -k start i=0 while [ ! -e "${PIDFILE}" ] && [ $i -lt ${TIMEOUT} ]; do @@ -84,7 +84,7 @@ stop() { checkconfd || return 1 ebegin "Stopping ${SVCNAME}" - ${APACHE2} ${APACHE2_OPTS} -k stop + start-stop-daemon --stop --pidfile ${PIDFILE} -- ${APACHE2} ${APACHE2_OPTS} -k stop i=0 while pidof "${APACHE2}" >/dev/null && [ $i -lt ${TIMEOUT} ]; do