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
67 67
	int ret;
68 68

  
69 69
	dopoll.dp_timeout = timeout_ms;
70
	dopoll.dp_nfds = ev->maxfds;
70
	dopoll.dp_nfds = ev->maxfds - 1;
71 71
	dopoll.dp_fds = ev->devpollfds;
72 72

  
73 73
	ret = ioctl(ev->devpoll_fd, DP_POLL, &dopoll);
src/server.c
697 697
			}
698 698
		}
699 699

  
700
		/* #372: solaris need some fds extra for devpoll */
701
		if (rlim.rlim_cur > 10) rlim.rlim_cur -= 10;
702

  
703 700
		if (srv->event_handler == FDEVENT_HANDLER_SELECT) {
704 701
			srv->max_fds = rlim.rlim_cur < FD_SETSIZE - 200 ? rlim.rlim_cur : FD_SETSIZE - 200;
705 702
		} else {
706
- 
    (1-1/1)