Browse Source

merged [274] and [239]

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.3.x@278 152afb58-edef-0310-8abb-c4023f1b3aa9
svn/tags/lighttpd-1.3.14
Jan Kneschke 17 years ago
parent
commit
ba06bde6d5
  1. 2
      doc/lighttpd.conf
  2. 2
      src/server.c

2
doc/lighttpd.conf

@ -64,7 +64,7 @@ mimetype.assign = (
".m3u" => "audio/x-mpegurl",
".wma" => "audio/x-ms-wma",
".wax" => "audio/x-ms-wax",
".ogg" => "audio/x-wav",
".ogg" => "application/ogg",
".wav" => "audio/x-wav",
".gif" => "image/gif",
".jpg" => "image/jpeg",

2
src/server.c

@ -559,6 +559,8 @@ int main (int argc, char **argv) {
setgid(grp->gr_gid);
setgroups(0, NULL);
}
if (srv->srvconf.username->used && srv->srvconf.groupname->used)
initgroups(srv->srvconf.username->ptr, grp->gr_gid);
if (srv->srvconf.username->used) setuid(pwd->pw_uid);
#endif
} else {

Loading…
Cancel
Save