restart (some) syscalls after SIGCHLD interrupted them; should fix LDAP problems (fixes #2464)

From: Stefan Bühler <stbuehler@web.de> git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@3108 152afb58-edef-0310-8abb-c4023f1b3aa9
7 years ago · d8f4d20d9a
parent 00063098c1
commit d8f4d20d9a
2 changed files with 4 additions and 0 deletions
--- a/1
+++ b/1
@ -36,6 +36,7 @@ NEWS
  * [core] accept $SERVER["socket"] without port, use server.port as fallback (fixes #2204)
  * [mod_magnet] define lua_pushglobaltable (for lua5.1) and use it (fixes #2719)
  * [ssl] support disabling ssl.verifyclient.activate in SNI callback (fixes #2531)
+  * restart (some) syscalls after SIGCHLD interrupted them; should fix LDAP problems (fixes #2464)

 - 1.4.39 - 2016-01-02
  * [core] fix memset_s call (fixes #2698)
--- a/src/server.c
+++ b/src/server.c
@ -973,6 +973,9 @@ int main (int argc, char **argv) {
 	sigaction(SIGTERM, &act, NULL);
 	sigaction(SIGHUP,  &act, NULL);
 	sigaction(SIGALRM, &act, NULL);
+
+	/* it should be safe to restart syscalls after SIGCHLD */
+	act.sa_flags |= SA_RESTART | SA_NOCLDSTOP;
 	sigaction(SIGCHLD, &act, NULL);

 #elif defined(HAVE_SIGNAL)