diff options
| author | Arno Töll <arno@debian.org> | 2012-11-21 23:03:41 +0100 |
|---|---|---|
| committer | Arno Töll <arno@debian.org> | 2012-11-21 23:03:41 +0100 |
| commit | 6a6df8dc258631c6eaccb03bf08845241f6dfa4a (patch) | |
| tree | 01eee8de64a85e5e2fef929050663ea2d3c850bd /src/server.c | |
| parent | ec2cb646eff482dfe32955d01781b01211b0a77c (diff) | |
| download | lighttpd-6a6df8dc258631c6eaccb03bf08845241f6dfa4a.tar.gz | |
Imported Upstream version 1.4.12upstream/1.4.12
Diffstat (limited to 'src/server.c')
| -rw-r--r-- | src/server.c | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/src/server.c b/src/server.c index 5a29a75..0222a22 100644 --- a/src/server.c +++ b/src/server.c @@ -286,9 +286,7 @@ static void show_version (void) { } static void show_features (void) { - show_version(); - printf("\nEvent Handlers:\n\n%s", - + const char features[] = "" #ifdef USE_SELECT "\t+ select (generic)\n" #else @@ -355,11 +353,6 @@ static void show_features (void) { #else "\t- crypt support\n" #endif -#ifdef USE_PAM - "\t+ PAM support\n" -#else - "\t- PAM support\n" -#endif #ifdef USE_OPENSSL "\t+ SSL Support\n" #else @@ -410,8 +403,9 @@ static void show_features (void) { #else "\t- GDBM support\n" #endif - "\n" - ); + "\n"; + show_version(); + printf("\nEvent Handlers:\n\n%s", features); } static void show_help (void) { @@ -518,7 +512,7 @@ int main (int argc, char **argv) { data_unset *dc = srv->config_context->data[0]; if (dc) { dc->print(dc, 0); - fprintf(stderr, "\n"); + fprintf(stdout, "\n"); } else { /* shouldn't happend */ fprintf(stderr, "global config not found\n"); @@ -953,8 +947,9 @@ int main (int argc, char **argv) { } } else { int status; - wait(&status); - num_childs++; + + /* ignore EINTR */ + if (-1 != wait(&status)) num_childs++; } } if (srv_shutdown) { |