Merge branch 'v0.3.3' into develop

This commit is contained in:
Willem Toorop 2015-09-04 16:14:41 +02:00
commit c3b59e76fa
1 changed files with 1 additions and 1 deletions

View File

@ -538,10 +538,10 @@ _getdns_upstreams_dereference(getdns_upstreams *upstreams)
|| upstream->event.write_cb || upstream->event.write_cb
|| upstream->event.timeout_cb) ) { || upstream->event.timeout_cb) ) {
GETDNS_CLEAR_EVENT(upstream->loop, &upstream->event);
upstream->event.read_cb = NULL; upstream->event.read_cb = NULL;
upstream->event.write_cb = NULL; upstream->event.write_cb = NULL;
upstream->event.timeout_cb = NULL; upstream->event.timeout_cb = NULL;
GETDNS_CLEAR_EVENT(upstream->loop, &upstream->event);
} }
if (upstream->tls_obj != NULL) { if (upstream->tls_obj != NULL) {
SSL_shutdown(upstream->tls_obj); SSL_shutdown(upstream->tls_obj);