summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-02-17 11:17:17 -0200
committerRenato Botelho <renato@netgate.com>2016-02-17 11:17:17 -0200
commiteea87801dfdf1b51cc56159a1b1eb69109b7c9e7 (patch)
tree1792ac0d334dd3ef5cf5459a0a61a5c0c86dccc0 /lib
parent3882f7f0612f5660c6287cfa1ba025f2843a1957 (diff)
parent4aef3019513be35be30d1ea8ff5b072a743f99df (diff)
downloadFreeBSD-src-eea87801dfdf1b51cc56159a1b1eb69109b7c9e7.zip
FreeBSD-src-eea87801dfdf1b51cc56159a1b1eb69109b7c9e7.tar.gz
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'lib')
-rw-r--r--lib/libfetch/http.c1
-rw-r--r--lib/libunbound/Makefile2
2 files changed, 1 insertions, 2 deletions
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index 206648d..ca522a6 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -1435,7 +1435,6 @@ http_connect(struct url *URL, struct url *purl, const char *flags)
}
if (strcasecmp(URL->scheme, SCHEME_HTTPS) == 0 &&
fetch_ssl(conn, URL, verbose) == -1) {
- fetch_close(conn);
/* grrr */
errno = EAUTH;
fetch_syserr();
diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile
index 8519b77..3c66181 100644
--- a/lib/libunbound/Makefile
+++ b/lib/libunbound/Makefile
@@ -12,7 +12,7 @@ PRIVATELIB=
CFLAGS= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR}
-SRCS= alloc.c autotrust.c config_file.c configlexer.l configparser.y \
+SRCS= alloc.c as112.c autotrust.c config_file.c configlexer.l configparser.y \
context.c dname.c dns.c dns64.c dnstree.c fptr_wlist.c infra.c \
iter_delegpt.c iter_donotq.c iter_fwd.c iter_hints.c iter_priv.c \
iter_resptype.c iter_scrub.c iter_utils.c iterator.c keyraw.c \
OpenPOWER on IntegriCloud