wt/mongoose
1
0
Fork 0
mirror of https://github.com/cesanta/mongoose.git synced 2026-10-12 10:13:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Propagate select() and socketpair() errors to the user

Browse Source
This commit is contained in:
Sergey Lyubka
2015-06-04 11:27:31 +01:00
parent 08fe9ac518
commit 30c0a3f201
1 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mongoose.c
+21 -7
View File
@@ -334,6 +334,7 @@ int ns_resolve(const char *domain_name, char *ip_addr_buf, size_t buf_len);
#define NS_CALLOC calloc
#endif
#define NS_MAX_SOCKETPAIR_ATTEMPTS 10
#define NS_CTL_MSG_MESSAGE_SIZE (8 * 1024)
#define NS_READ_BUFFER_SIZE 2048
#define NS_UDP_RECEIVE_BUFFER_SIZE 2000
@@ -1107,7 +1108,9 @@ time_t ns_mgr_poll(struct ns_mgr *mgr, int milli) {
tv.tv_sec = milli / 1000;
tv.tv_usec = (milli % 1000) * 1000;
if (select((int) max_fd + 1, &read_set, &write_set, NULL, &tv) > 0) {
if (select((int) max_fd + 1, &read_set, &write_set, NULL, &tv) < 0) {
return 0;
} else {
// select() might have been waiting for a long time, reset current_time
// now to prevent last_io_time being set to the past.
current_time = time(NULL);
@@ -1258,9 +1261,12 @@ void ns_mgr_init(struct ns_mgr *s, void *user_data) {
#endif
#ifndef NS_DISABLE_SOCKETPAIR
do {
ns_socketpair2(s->ctl, SOCK_DGRAM);
} while (s->ctl[0] == INVALID_SOCKET);
{
int attempts = 0, max_attempts = NS_MAX_SOCKETPAIR_ATTEMPTS;
do {
ns_socketpair2(s->ctl, SOCK_DGRAM);
} while (s->ctl[0] == INVALID_SOCKET && ++attempts < max_attempts);
}
#endif
#ifdef NS_ENABLE_SSL
@@ -2325,9 +2331,17 @@ static void open_cgi_endpoint(struct connection *conn, const char *prog) {
// Try to create socketpair in a loop until success. ns_socketpair()
// can be interrupted by a signal and fail.
// TODO(lsm): use sigaction to restart interrupted syscall
do {
ns_socketpair(fds);
} while (fds[0] == INVALID_SOCKET);
{
int attempts = 0, max_attempts = NS_MAX_SOCKETPAIR_ATTEMPTS;
do {
ns_socketpair(fds);
} while (fds[0] == INVALID_SOCKET && ++attempts < max_attempts);
if (fds[0] == INVALID_SOCKET) {
closesocket(fds[0]);
send_http_error(conn, 500, "ns_socketpair() failed");
}
}
if (start_process(conn->server->config_options[CGI_INTERPRETER],
prog, blk.buf, blk.vars, dir, fds[1]) != 0) {