diff options
| author |   Thilo Bangert <bangert@gentoo.org> | 2009-07-03 21:17:11 +0000 |
|---|---|---|
| committer | Thilo Bangert <bangert@gentoo.org> | 2009-07-03 21:17:11 +0000 |
| commit | ac4e92640be3d8007b512ff90be5b758a56fcdb9 (patch) | |
| tree | f6ccb44fc5a02024a3d1ae8132a5cc1d7e1bfeba /www-servers/spawn-fcgi | |
| parent | add ieee1394 useflag for dv cams, bug #268685 (diff) | |
| download | gentoo-2-ac4e92640be3d8007b512ff90be5b758a56fcdb9.tar.gz gentoo-2-ac4e92640be3d8007b512ff90be5b758a56fcdb9.tar.bz2 gentoo-2-ac4e92640be3d8007b512ff90be5b758a56fcdb9.zip | |
strip env (bug #271425)
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'www-servers/spawn-fcgi')
| -rw-r--r-- | www-servers/spawn-fcgi/ChangeLog | 6 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/files/spawn-fcgi.confd | 6 | ||||
| -rw-r--r-- | www-servers/spawn-fcgi/files/spawn-fcgi.initd | 4 |
3 files changed, 10 insertions, 6 deletions
diff --git a/www-servers/spawn-fcgi/ChangeLog b/www-servers/spawn-fcgi/ChangeLog index 15132a49b8cc..ccaa82142e2a 100644 --- a/www-servers/spawn-fcgi/ChangeLog +++ b/www-servers/spawn-fcgi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for www-servers/spawn-fcgi # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.18 2009/07/03 21:00:38 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/ChangeLog,v 1.19 2009/07/03 21:17:10 bangert Exp $ + + 03 Jul 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd, + files/spawn-fcgi.initd: + strip env (bug #271425) 03 Jul 2009; Thilo Bangert <bangert@gentoo.org> files/spawn-fcgi.confd, files/spawn-fcgi.initd: diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.confd b/www-servers/spawn-fcgi/files/spawn-fcgi.confd index 6605d8610827..8f7901234710 100644 --- a/www-servers/spawn-fcgi/files/spawn-fcgi.confd +++ b/www-servers/spawn-fcgi/files/spawn-fcgi.confd @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.4 2009/07/03 21:00:38 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.confd,v 1.5 2009/07/03 21:17:11 bangert Exp $ # DO NOT MODIFY THIS FILE DIRECTLY! CREATE A COPY AND MODIFY THAT INSTEAD! @@ -57,7 +57,7 @@ FCGI_GROUP= # If your application requires additional environment variables, you may # specify them here. See PHP example below. # -ALLOWED_ENV= +ALLOWED_ENV="PATH" # PHP ONLY :: These two options are specific to PHP. The first is the number # of child processes to spawn. The second is the number of requests to be @@ -67,4 +67,4 @@ ALLOWED_ENV= #PHP_FCGI_MAX_REQUESTS=500 # # For this to work you would set -# ALLOWED_ENV="PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS" +# ALLOWED_ENV="PATH PHP_FCGI_CHILDREN PHP_FCGI_MAX_REQUESTS" diff --git a/www-servers/spawn-fcgi/files/spawn-fcgi.initd b/www-servers/spawn-fcgi/files/spawn-fcgi.initd index 7e6c0e263445..0d6abd0e784d 100644 --- a/www-servers/spawn-fcgi/files/spawn-fcgi.initd +++ b/www-servers/spawn-fcgi/files/spawn-fcgi.initd @@ -1,7 +1,7 @@ #!/sbin/runscript # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.9 2009/07/03 21:00:38 bangert Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-servers/spawn-fcgi/files/spawn-fcgi.initd,v 1.10 2009/07/03 21:17:10 bangert Exp $ PROGNAME=${SVCNAME#*.} SPAWNFCGI=/usr/bin/spawn-fcgi @@ -89,7 +89,7 @@ start() { [ -n "${FCGI_SOCKET}" ] && SOCKET_OPTION="-s ${FCGI_SOCKET}-${X}" [ -n "${FCGI_PORT}" ] && INET_OPTION="-a ${FCGI_ADDRESS} -p $((${FCGI_PORT} + ${X} - 1))" - env ${E} start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \ + env -i ${E} /sbin/start-stop-daemon --start --pidfile ${P} --exec ${SPAWNFCGI} \ --name ${FCGI_PROGRAM_EXEC} -- ${SOCKET_OPTION} ${INET_OPTION} \ -P ${P} ${OPTIONS} -- ${FCGI_PROGRAM} RETVAL=$? |