aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Bühler <stbuehler@web.de>2009-04-18 09:38:30 +0000
committerStefan Bühler <stbuehler@web.de>2009-04-18 09:38:30 +0000
commit010312e53c1663eaa82332ea36065c18ac4f07b4 (patch)
treea7dfca6fe9c7f98b0d9368c5ac7447782245a4a4
parent36734bc41f20ad2fa63f63089ebccfc9b7291e61 (diff)
downloadspawn-fcgi-010312e53c1663eaa82332ea36065c18ac4f07b4.tar.gz
spawn-fcgi-010312e53c1663eaa82332ea36065c18ac4f07b4.zip
List IPv6 as feature after the version if it is supported
git-svn-id: svn://svn.lighttpd.net/spawn-fcgi/trunk@44 4a9f3682-ca7b-49a8-9a55-ba4640e46f83
-rw-r--r--NEWS1
-rw-r--r--src/spawn-fcgi.c12
2 files changed, 11 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index 5b49193..18ba771 100644
--- a/NEWS
+++ b/NEWS
@@ -8,6 +8,7 @@ NEWS
* Add IPv6 support
* Fix problems with usernames starting with a digit and not existing uids; add warning if only user privs are dropped. (fixes #1959)
* Add check to link against socket/nsl if needed (fixes #1960)
+ * List IPv6 as feature after the version if it is supported
- 1.6.1 - 2009-03-29
diff --git a/src/spawn-fcgi.c b/src/spawn-fcgi.c
index 772a923..98c21c2 100644
--- a/src/spawn-fcgi.c
+++ b/src/spawn-fcgi.c
@@ -69,6 +69,15 @@ static int issetugid() {
# define USE_IPV6
#endif
+#ifdef USE_IPV6
+#define PACKAGE_FEATURES " (ipv6)"
+#else
+#define PACKAGE_FEATURES ""
+#endif
+
+#define PACKAGE_DESC "spawn-fcgi v" PACKAGE_VERSION PACKAGE_FEATURES " - spawns FastCGI processes\n"
+
+
static int bind_socket(const char *addr, unsigned short port, const char *unixsocket, uid_t uid, gid_t gid, int mode) {
int fcgi_fd, socket_type, val;
@@ -394,7 +403,6 @@ static int find_user_group(const char *user, const char *group, uid_t *uid, gid_
return 0;
}
-#define PACKAGE_DESC "spawn-fcgi v" PACKAGE_VERSION " - spawns FastCGI processes\n"
static void show_version () {
const char *b = PACKAGE_DESC
"Build-Date: " __DATE__ " " __TIME__ "\n";
@@ -406,7 +414,7 @@ static void show_help () {
char *b = \
"Usage: spawn-fcgi [options] [-- <fcgiapp> [fcgi app arguments]]\n" \
"\n" \
-"spawn-fcgi v" PACKAGE_VERSION " - spawns FastCGI processes\n" \
+PACKAGE_DESC \
"\n" \
"Options:\n" \
" -f <path> filename of the fcgi-application (ignored if <fcgiapp> is given)\n" \