emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

httpd: NOMMU fixes by Alex Landau <landau_alex@yahoo.com>

Browse Source
This commit is contained in:
Denis Vlasenko 2007-06-23 23:14:02 +00:00
parent 198badafd8
commit 56258b688c
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
networking/httpd.c
View File

@ -841,6 +841,7 @@ static void decodeBase64(char *Data)
* $Errors: None * $Errors: None
* *
****************************************************************************/ ****************************************************************************/
#if BB_MMU
static int openServer(void) static int openServer(void)
{ {
int fd; int fd;
@ -850,6 +851,7 @@ static int openServer(void)
xlisten(fd, 9); xlisten(fd, 9);
return fd; return fd;
} }
#endif
/**************************************************************************** /****************************************************************************
* *
@ -1821,6 +1823,7 @@ static void handleIncoming(void)
close(accepted_socket); close(accepted_socket);
} }
#if BB_MMU
/**************************************************************************** /****************************************************************************
* *
> $Function: miniHttpd() > $Function: miniHttpd()
@ -1900,6 +1903,7 @@ static int miniHttpd(int server)
} /* while (1) */ } /* while (1) */
return 0; return 0;
} }
#endif
/* from inetd */ /* from inetd */
static int miniHttpd_inetd(void) static int miniHttpd_inetd(void)
@ -2033,6 +2037,7 @@ int httpd_main(int argc, char **argv)
xchdir(home_httpd); xchdir(home_httpd);
if (!(opt & OPT_INETD)) { if (!(opt & OPT_INETD)) {
#if BB_MMU
signal(SIGCHLD, SIG_IGN); signal(SIGCHLD, SIG_IGN);
server_socket = openServer(); server_socket = openServer();
#if ENABLE_FEATURE_HTTPD_SETUID #if ENABLE_FEATURE_HTTPD_SETUID
@ -2045,6 +2050,9 @@ int httpd_main(int argc, char **argv)
} }
xsetuid(ugid.uid); xsetuid(ugid.uid);
} }
#endif
#else /* BB_MMU */
bb_error_msg_and_die("-i is required");
#endif #endif
} }
@ -2069,7 +2077,11 @@ int httpd_main(int argc, char **argv)
if (opt & OPT_INETD) if (opt & OPT_INETD)
return miniHttpd_inetd(); return miniHttpd_inetd();
#if BB_MMU
if (!(opt & OPT_FOREGROUND)) if (!(opt & OPT_FOREGROUND))
bb_daemonize(0); /* don't change current directory */ bb_daemonize(0); /* don't change current directory */
return miniHttpd(server_socket); return miniHttpd(server_socket);
#else
return 0; /* not reached */
#endif
} }