upstream/unbound
1
0
Fork 0
mirror of https://github.com/NLnetLabs/unbound.git synced 2025-12-20 23:00:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

- Fix nettle compile.

Browse source 
git-svn-id: file:///svn/unbound/trunk@4555 be551aaa-1e26-0410-a405-d3ace91eadb9
This commit is contained in:
Wouter Wijngaards 2018-02-27 13:03:54 +00:00
parent 1df2544e07
commit 9f88892190
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/Changelog
View file

@ -2,6 +2,7 @@
- Fixup contrib/fastrpz.patch so that it applies. - Fixup contrib/fastrpz.patch so that it applies.
- Fix compile without threads, and remove unused variable. - Fix compile without threads, and remove unused variable.
- Fix compile with staticexe and python module. - Fix compile with staticexe and python module.
- Fix nettle compile.
22 February 2018: Ralph 22 February 2018: Ralph
- Save wildcard RRset from answer with original owner for use in - Save wildcard RRset from answer with original owner for use in

6
util/netevent.c
View file

@ -2029,12 +2029,14 @@ comm_point_http_handle_read(int fd, struct comm_point* c)
log_assert(fd != -1); log_assert(fd != -1);
/* if we are in ssl handshake, handle SSL handshake */ /* if we are in ssl handshake, handle SSL handshake */
#ifdef HAVE_SSL
if(c->ssl && c->ssl_shake_state != comm_ssl_shake_none) { if(c->ssl && c->ssl_shake_state != comm_ssl_shake_none) {
if(!ssl_handshake(c)) if(!ssl_handshake(c))
return 0; return 0;
if(c->ssl_shake_state != comm_ssl_shake_none) if(c->ssl_shake_state != comm_ssl_shake_none)
return 1; return 1;
} }
#endif /* HAVE_SSL */
if(!c->tcp_is_reading) if(!c->tcp_is_reading)
return 1; return 1;
@ -2227,12 +2229,14 @@ comm_point_http_handle_write(int fd, struct comm_point* c)
c->tcp_check_nb_connect = 0; c->tcp_check_nb_connect = 0;
} }
/* if we are in ssl handshake, handle SSL handshake */ /* if we are in ssl handshake, handle SSL handshake */
#ifdef HAVE_SSL
if(c->ssl && c->ssl_shake_state != comm_ssl_shake_none) { if(c->ssl && c->ssl_shake_state != comm_ssl_shake_none) {
if(!ssl_handshake(c)) if(!ssl_handshake(c))
return 0; return 0;
if(c->ssl_shake_state != comm_ssl_shake_none) if(c->ssl_shake_state != comm_ssl_shake_none)
return 1; return 1;
} }
#endif /* HAVE_SSL */
if(c->tcp_is_reading) if(c->tcp_is_reading)
return 1; return 1;
/* if we are writing, write more */ /* if we are writing, write more */
@ -2717,7 +2721,9 @@ comm_point_create_http_out(struct comm_base *base, size_t bufsize,
if(c->ev->ev == NULL) if(c->ev->ev == NULL)
{ {
log_err("could not baseset tcpout event"); log_err("could not baseset tcpout event");
#ifdef HAVE_SSL
SSL_free(c->ssl); SSL_free(c->ssl);
#endif
sldns_buffer_free(c->buffer); sldns_buffer_free(c->buffer);
free(c->ev); free(c->ev);
free(c); free(c);