aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2009-09-23 12:27:12 +0000
committerStefan Bühler <stbuehler@web.de>2009-09-23 12:27:12 +0000
commitc4782f42117818d078f261aacace88786af0d534 (patch)
treebd1b937b869e73ec9706836a292a609a6a61211a
parentc51f3a2c21dca599459f46268ce5bcc0d3609667 (diff)
downloadspawn-fcgi-c4782f42117818d078f261aacace88786af0d534.tar.gz
spawn-fcgi-c4782f42117818d078f261aacace88786af0d534.zip
Add deprecated and /bin/sh info for -f option; wrap syntax output (fixes #2044)
git-svn-id: svn://svn.lighttpd.net/spawn-fcgi/trunk@53 4a9f3682-ca7b-49a8-9a55-ba4640e46f83
-rw-r--r--NEWS1
-rw-r--r--src/spawn-fcgi.c10
2 files changed, 7 insertions, 4 deletions
diff --git a/NEWS b/NEWS
index cc1d68a..c7d515a 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,7 @@ NEWS
* Fix unix socket mode change to work without specifying user/group for socket
* Add some ./run script examples for use with daemontools or runit
* Fix Invalid Argument in chmod if mode=-1 (fixes 2033)
+ * Add deprecated and /bin/sh info for -f option; wrap syntax output (fixes #2044)
- 1.6.2 - 2009-04-18
* Add homepage to README
diff --git a/src/spawn-fcgi.c b/src/spawn-fcgi.c
index 09a0da0..5271a31 100644
--- a/src/spawn-fcgi.c
+++ b/src/spawn-fcgi.c
@@ -337,7 +337,6 @@ static int fcgi_spawn_connection(char *appPath, char **appArgv, int fcgi_fd, int
}
}
close(pid_fd);
- pid_fd = -1;
close(fcgi_fd);
@@ -418,7 +417,8 @@ static void show_help () {
PACKAGE_DESC \
"\n" \
"Options:\n" \
- " -f <path> filename of the fcgi-application (ignored if <fcgiapp> is given)\n" \
+ " -f <path> filename of the fcgi-application (deprecated; ignored if\n" \
+ " <fcgiapp> is given; needs /bin/sh)\n" \
" -d <directory> chdir to directory before spawning\n" \
" -a <address> bind to IPv4/IPv6 address (defaults to 0.0.0.0)\n" \
" -p <port> bind to TCP-port\n" \
@@ -433,9 +433,11 @@ static void show_help () {
" -?, -h show this help\n" \
"(root only)\n" \
" -c <directory> chroot to directory\n" \
- " -S create socket before chroot() (default is to create the socket in the chroot)\n" \
+ " -S create socket before chroot() (default is to create the socket\n" \
+ " in the chroot)\n" \
" -u <user> change to user-id\n" \
- " -g <group> change to group-id (default: primary group of user if -u is given)\n" \
+ " -g <group> change to group-id (default: primary group of user if -u\n" \
+ " is given)\n" \
" -U <user> change Unix domain socket owner to user-id\n" \
" -G <group> change Unix domain socket group to group-id\n" \
));