Permalink
Browse files

from trunk: do not warn on accept when errno is egain|eintr

svn:r926
  • Loading branch information...
1 parent 541290f commit abe3ac118c26cc8ee5b450cb4b37baf1b8999919 @provos provos committed Jul 25, 2008
Showing with 3 additions and 1 deletion.
  1. +1 −0 ChangeLog
  2. +2 −1 http.c
View
@@ -15,6 +15,7 @@ Changes in 1.4.6-stable:
o Fix a problem with epoll() and reinit; problem report by Alexander Drozdov.
o Fix off-by-one errors in devpoll; from Ian Bell
o Make event_add not change any state if it fails; reported by Ian Bell.
+ o Do not warn on accept when errno is either EAGAIN or EINTR
Changes in 1.4.5-stable:
o Fix connection keep-alive behavior for HTTP/1.0
View
3 http.c
@@ -2188,7 +2188,8 @@ accept_socket(int fd, short what, void *arg)
int nfd;
if ((nfd = accept(fd, (struct sockaddr *)&ss, &addrlen)) == -1) {
- event_warn("%s: bad accept", __func__);
+ if (errno != EAGAIN && errno != EINTR)
+ event_warn("%s: bad accept", __func__);
return;
}
if (evutil_make_socket_nonblocking(nfd) < 0)

0 comments on commit abe3ac1

Please sign in to comment.