Project

General

Profile

Bug #1562 ยป Fix-372-and-1562.patch

Patch for 1.4 and 1.5 - stbuehler, 2008-02-13 14:38

View differences:

src/fdevent_solaris_devpoll.c
int ret;
dopoll.dp_timeout = timeout_ms;
dopoll.dp_nfds = ev->maxfds;
dopoll.dp_nfds = ev->maxfds - 1;
dopoll.dp_fds = ev->devpollfds;
ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll);
src/server.c
}
}
/* #372: solaris need some fds extra for devpoll */
if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10;
if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
} else {
    (1-1/1)