From 04291bc5aee1e020997894cfd497d14392ad2ced Mon Sep 17 00:00:00 2001 From: Denis Vlasenko Date: Tue, 21 Nov 2006 10:15:25 +0000 Subject: httpd: slight reduction of #ifdef forest few other applets: #ifdef CONFIG_ -> #if ENABLE_ traceroute: fix exposed bugs defconfig: update --- networking/httpd.c | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) (limited to 'networking/httpd.c') diff --git a/networking/httpd.c b/networking/httpd.c index 08b40e014..3b948b98d 100644 --- a/networking/httpd.c +++ b/networking/httpd.c @@ -1756,22 +1756,19 @@ static int miniHttpd(int server) /* set the KEEPALIVE option to cull dead connections */ on = 1; setsockopt(s, SOL_SOCKET, SO_KEEPALIVE, (void *)&on, sizeof(on)); -#if !DEBUG - if (fork() == 0) -#endif - { - /* This is the spawned thread */ + + if (DEBUG || fork() == 0) { + /* child */ #if ENABLE_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP /* protect reload config, may be confuse checking */ signal(SIGHUP, SIG_IGN); #endif handleIncoming(); -#if !DEBUG - exit(0); -#endif + if (!DEBUG) + exit(0); } close(s); - } // while (1) + } /* while (1) */ return 0; } -- cgit v1.2.3