aboutsummaryrefslogtreecommitdiffstats
path: root/src/fetch.c
diff options
context:
space:
mode:
authorPedro F. Giffuni <pfg@FreeBSD.org>2016-03-02 14:51:22 +0000
committerPedro F. Giffuni <pfg@FreeBSD.org>2016-03-02 14:51:22 +0000
commit0d3f794e1b3ff5fad5e58a91722c3143b77642d6 (patch)
tree1cc68eea36bb41ada982d80dba9348b1a83455d4 /src/fetch.c
parentfaf4814606d432aaa129677e45c357193b960ab9 (diff)
downloadsrc-vendor/tnftp.tar.gz
src-vendor/tnftp.zip
Import tnftp-20150912vendor/tnftp
Notes
Notes: svn path=/vendor/tnftp/dist/; revision=296314
Diffstat (limited to 'src/fetch.c')
-rw-r--r--src/fetch.c13
1 files changed, 8 insertions, 5 deletions
diff --git a/src/fetch.c b/src/fetch.c
index 6981f77fff86..d0f40d3f99f3 100644
--- a/src/fetch.c
+++ b/src/fetch.c
@@ -1,8 +1,8 @@
-/* $NetBSD: fetch.c,v 1.20 2014/10/31 03:37:59 lukem Exp $ */
-/* from NetBSD: fetch.c,v 1.206 2014/10/26 16:21:59 christos Exp */
+/* $NetBSD: fetch.c,v 1.21 2015/10/04 04:53:26 lukem Exp $ */
+/* from NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp */
/*-
- * Copyright (c) 1997-2009 The NetBSD Foundation, Inc.
+ * Copyright (c) 1997-2015 The NetBSD Foundation, Inc.
* All rights reserved.
*
* This code is derived from software contributed to The NetBSD Foundation
@@ -11,6 +11,9 @@
* This code is derived from software contributed to The NetBSD Foundation
* by Scott Aaron Bamford.
*
+ * This code is derived from software contributed to The NetBSD Foundation
+ * by Thomas Klausner.
+ *
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
@@ -39,7 +42,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID(" NetBSD: fetch.c,v 1.206 2014/10/26 16:21:59 christos Exp ");
+__RCSID(" NetBSD: fetch.c,v 1.207 2015/09/12 19:38:42 wiz Exp ");
#endif /* not lint */
/*
@@ -789,7 +792,7 @@ fetch_url(const char *url, const char *proxyenv, char *proxyauth, char *wwwauth)
#ifdef WITH_SSL
if (urltype == HTTPS_URL_T) {
- if ((ssl = fetch_start_ssl(s)) == NULL) {
+ if ((ssl = fetch_start_ssl(s, host)) == NULL) {
close(s);
s = -1;
continue;