GitHub/libevent
1
0
Fork 0
mirror of https://github.com/libevent/libevent.git synced 2025-01-31 09:12:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/patches-2.0'

Browse Source
This commit is contained in:
Nick Mathewson 2011-08-15 11:14:57 -04:00
commit d7451b0523
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
evdns.c
View File

@ -647,6 +647,8 @@ request_finished(struct request *const req, struct request **head, int free_hand
} else { } else {
base->global_requests_waiting--; base->global_requests_waiting--;
} }
/* it was initialized during request_new / evtimer_assign */
event_debug_unassign(&req->timeout_event);
if (!req->request_appended) { if (!req->request_appended) {
/* need to free the request data on it's own */ /* need to free the request data on it's own */

2
include/event2/dns.h
View File

@ -377,7 +377,7 @@ struct evdns_request *evdns_base_resolve_reverse_ipv6(struct evdns_base *base, c
@param base the evdns_base that was used to make the request @param base the evdns_base that was used to make the request
@param req the evdns_request that was returned by calling a resolve function @param req the evdns_request that was returned by calling a resolve function
@see evdns_base_resolve_ip4(), evdns_base_resolve_ipv6, evdns_base_resolve_reverse @see evdns_base_resolve_ipv4(), evdns_base_resolve_ipv6, evdns_base_resolve_reverse
*/ */
void evdns_cancel_request(struct evdns_base *base, struct evdns_request *req); void evdns_cancel_request(struct evdns_base *base, struct evdns_request *req);

4
signal.c
View File

@ -400,9 +400,11 @@ evsig_dealloc(struct event_base *base)
int i = 0; int i = 0;
if (base->sig.ev_signal_added) { if (base->sig.ev_signal_added) {
event_del(&base->sig.ev_signal); event_del(&base->sig.ev_signal);
event_debug_unassign(&base->sig.ev_signal);
base->sig.ev_signal_added = 0; base->sig.ev_signal_added = 0;
} }
/* debug event is created in evsig_init/event_assign even when
* ev_signal_added == 0, so unassign is required */
event_debug_unassign(&base->sig.ev_signal);
for (i = 0; i < NSIG; ++i) { for (i = 0; i < NSIG; ++i) {
if (i < base->sig.sh_old_max && base->sig.sh_old[i] != NULL) if (i < base->sig.sh_old_max && base->sig.sh_old[i] != NULL)