- Merge in upstream commit d9826c8d75b4798de1e559adb84c7cd66fc44297 to resolve kqueue issue.

- Bump PORTREVISION

PR:		196600
Submitted by:	ncrogers@gmail.com
This commit is contained in:
Ryan Steinmetz 2015-01-07 23:29:13 +00:00
parent cf8b244f11
commit 8f5debaa5c
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=376505
2 changed files with 36 additions and 0 deletions

View file

@ -3,6 +3,7 @@
PORTNAME= freeradius
DISTVERSION= 3.0.6
PORTREVISION= 1
CATEGORIES= net
MASTER_SITES= ftp://ftp.freeradius.org/pub/freeradius/%SUBDIR%/ \
ftp://ftp.ntua.gr/pub/net/radius/freeradius/%SUBDIR%/ \

View file

@ -0,0 +1,35 @@
--- src/lib/event.c 2014-12-17 13:49:16.000000000 -0800
+++ src/lib/event.c 2015-01-07 10:06:46.000000000 -0800
@@ -630,9 +630,9 @@
* Loop over all of the events, servicing them.
*/
for (i = 0; i < rcode; i++) {
- if (el->events[i].flags & EV_EOF) {
- fr_event_fd_t *ef = el->events[i].udata;
+ fr_event_fd_t *ef = el->events[i].udata;
+ if (el->events[i].flags & EV_EOF) {
/*
* FIXME: delete the handler
* here, and fix process.c to not
@@ -646,14 +646,12 @@
continue;
}
- if (el->events[i].flags & EVFILT_READ) {
- fr_event_fd_t *ef = el->events[i].udata;
-
- ef->handler(el, ef->fd, ef->ctx);
- continue;
- }
-
- /* else it's an unhandled event, which shouldn't happen */
+ /*
+ * Else it's our event. We only set
+ * EVFILT_READ, so it must be a read
+ * event.
+ */
+ ef->handler(el, ef->fd, ef->ctx);
}
#endif /* HAVE_KQUEUE */
}