stv0g/libwebsockets
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ppoll fix signal mask sense

Browse source 
Signed-off-by: Andy Green <andy.green@linaro.org>
This commit is contained in:
Andy Green 2014-01-11 12:37:07 +08:00
parent 3b3fa9e208
commit ed451d5cbf
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib/libwebsockets.c
View file

@ -1354,8 +1354,9 @@ libwebsocket_service(struct libwebsocket_context *context, int timeout_ms)
timeout_ts.tv_sec = timeout_ms / 1000; timeout_ts.tv_sec = timeout_ms / 1000;
timeout_ts.tv_nsec = timeout_ms % 1000; timeout_ts.tv_nsec = timeout_ms % 1000;
sigemptyset(&sigmask);
sigaddset(&sigmask, SIGUSR2); sigprocmask(SIG_BLOCK, NULL, &sigmask);
sigdelset(&sigmask, SIGUSR2);
/* wait for something to need service */ /* wait for something to need service */
@ -1369,8 +1370,12 @@ libwebsocket_service(struct libwebsocket_context *context, int timeout_ms)
return 0; return 0;
} }
if (n < 0) if (n < 0) {
return -1; if (errno != EINTR)
return -1;
else
return 0;
}
/* any socket with events to service? */ /* any socket with events to service? */
@ -2100,6 +2105,13 @@ libwebsocket_create_context(struct lws_context_creation_info *info)
} }
signal(SIGUSR2, lws_sigusr2); signal(SIGUSR2, lws_sigusr2);
{
sigset_t mask;
sigemptyset (&mask);
sigaddset (&mask, SIGUSR2);
sigprocmask(SIG_BLOCK, &mask, NULL);
}
#ifdef SSL_OP_NO_COMPRESSION #ifdef SSL_OP_NO_COMPRESSION
SSL_CTX_set_options(context->ssl_ctx, SSL_OP_NO_COMPRESSION); SSL_CTX_set_options(context->ssl_ctx, SSL_OP_NO_COMPRESSION);