From: Nick Mathewson <nickm@torproject.org>
Date: Sat, 9 Oct 2010 04:02:31 +0000 (-0400)
Subject: Merge branch '20_internal_prio'
X-Git-Tag: release-2.0.8-rc~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7ad90f6a25a952836892fbd12b7ad9a43feac9be;p=libevent

Merge branch '20_internal_prio'
---

7ad90f6a25a952836892fbd12b7ad9a43feac9be
diff --cc signal.c
index 9a5c868f,86361cce..f840e259
--- a/signal.c
+++ b/signal.c
@@@ -199,11 -133,13 +199,12 @@@ evsig_init(struct event_base *base
  	evutil_make_socket_nonblocking(base->sig.ev_signal_pair[1]);
  
  	event_assign(&base->sig.ev_signal, base, base->sig.ev_signal_pair[1],
 -		EV_READ | EV_PERSIST, evsig_cb, &base->sig.ev_signal);
 +		EV_READ | EV_PERSIST, evsig_cb, base);
  
  	base->sig.ev_signal.ev_flags |= EVLIST_INTERNAL;
+ 	event_priority_set(&base->sig.ev_signal, 0);
  
  	base->evsigsel = &evsigops;
 -	base->evsigbase = &base->sig;
  
  	return 0;
  }