 @@ -1,14 +1,14 @@
-/*	$NetBSD: common.c,v 1.30 2016/10/20 21:22:18 joerg Exp $	*/
+/*	$NetBSD: common.c,v 1.31 2016/10/20 21:25:57 joerg Exp $	*/
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * Copyright (c) 2008, 2010 Joerg Sonnenberger <joerg@NetBSD.org>
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
 @@ -230,26 +230,27 @@ fetch_default_proxy_port(const char *sch
 conn_t *
 fetch_reopen(int sd)
+{
 	conn_t *conn;
 	/* allocate and fill connection structure */
 	if ((conn = calloc(1, sizeof(*conn))) == NULL)
 		return (NULL);
 	conn->ftp_home = NULL;
 	conn->cache_url = NULL;
 	conn->next_buf = NULL;
 	conn->next_len = 0;
 	conn->sd = sd;
 	conn->buf_events = POLLIN;
 	return (conn);
+}
 /*
  * Bind a socket to a specific local address
  */
 int
 fetch_bind(int sd, int af, const char *addr)
+{
 	struct addrinfo hints, *res, *res0;
 	memset(&hints, 0, sizeof(hints));
 @@ -446,26 +447,27 @@ fetch_ssl(conn_t *conn, const struct url
+	}
 	SSL_load_error_strings();
 	conn->ssl_meth = SSLv23_client_method();
 	conn->ssl_ctx = SSL_CTX_new(conn->ssl_meth);
 	SSL_CTX_set_mode(conn->ssl_ctx, SSL_MODE_AUTO_RETRY);
 	conn->ssl = SSL_new(conn->ssl_ctx);
 	if (conn->ssl == NULL){
 		fprintf(stderr, "SSL context creation failed\n");
 		return (-1);
+	}
 	conn->buf_events = 0;
 	SSL_set_fd(conn->ssl, conn->sd);
 #if OPENSSL_VERSION_NUMBER >= 0x0090806fL && !defined(OPENSSL_NO_TLSEXT)
 	if (!SSL_set_tlsext_host_name(conn->ssl, (char *)(uintptr_t)URL->host)) {
 		fprintf(stderr,
 		    "TLS server name indication extension failed for host %s\n",
 		    URL->host);
 		return (-1);
+	}
 #endif
 	if (SSL_connect(conn->ssl) == -1){
 		ERR_print_errors_fp(stderr);
 		return (-1);
+	}
 @@ -527,50 +529,67 @@ fetch_read(conn_t *conn, char *buf, size
 			len = conn->next_len;
 		memmove(buf, conn->next_buf, len);
 		conn->next_len -= len;
 		conn->next_buf += len;
 		return len;
+	}
 	if (fetchTimeout) {
 		gettimeofday(&timeout_end, NULL);
 		timeout_end.tv_sec += fetchTimeout;
+	}
 	pfd.fd = conn->sd;
 	pfd.events = POLLIN;
 	for (;;) {
-		if (fetchTimeout) {
+		pfd.events = conn->buf_events;
 		if (fetchTimeout && pfd.events) {
 			do {
 				timeout_cur = compute_timeout(&timeout_end);
 				if (timeout_cur < 0) {
 					errno = ETIMEDOUT;
 					fetch_syserr();
 					return (-1);
+				}
 				errno = 0;
 				r = poll(&pfd, 1, timeout_cur);
 				if (r == -1) {
 					if (errno == EINTR && fetchRestartCalls)
 						continue;
 					fetch_syserr();
 					return (-1);
+				}
 			} while (pfd.revents == 0);
+		}
 #ifdef WITH_SSL
-		if (conn->ssl != NULL)
+		if (conn->ssl != NULL) {
 			rlen = SSL_read(conn->ssl, buf, len);
-		else
+			if (rlen == -1) {
 				switch (SSL_get_error(conn->ssl, rlen)) {
 				case SSL_ERROR_WANT_READ:
 					conn->buf_events = POLLIN;
 					break;
 				case SSL_ERROR_WANT_WRITE:
 					conn->buf_events = POLLOUT;
 					break;
 				default:
 					errno = EIO;
 					fetch_syserr();
 					return -1;
+				}
 			} else {
 				/* Assume buffering on the SSL layer. */
 				conn->buf_events = 0;
+			}
 		} else
 #endif
 			rlen = read(conn->sd, buf, len);
 		if (rlen >= 0)
 			break;
 		if (errno != EINTR || !fetchRestartCalls)
 			return (-1);
+	}
 	return (rlen);
+}
 /*

 @@ -1,14 +1,14 @@
-/*	$NetBSD: common.h,v 1.23 2014/01/08 20:25:34 joerg Exp $	*/
+/*	$NetBSD: common.h,v 1.24 2016/10/20 21:25:57 joerg Exp $	*/
 /*-
  * Copyright (c) 1998-2004 Dag-Erling Coïdan Smørgrav
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer
  *    in this position and unchanged.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -56,26 +56,27 @@
     !defined(__digital__) && !defined(__linux) && !defined(__MINT__) && \
     !defined(__sgi) && !defined(__minix) && !defined(__CYGWIN__)
 #define HAVE_SA_LEN
 #endif
 /* Connection */
 typedef struct fetchconn conn_t;
 struct fetchconn {
 	int		 sd;		/* socket descriptor */
 	char		*buf;		/* buffer */
 	size_t		 bufsize;	/* buffer size */
 	size_t		 buflen;	/* length of buffer contents */
 	int		 buf_events;	/* poll flags for the next cycle */
 	char		*next_buf;	/* pending buffer, e.g. after getln */
 	size_t		 next_len;	/* size of pending buffer */
 	int		 err;		/* last protocol reply code */
 #ifdef WITH_SSL
 	SSL		*ssl;		/* SSL handle */
 	SSL_CTX		*ssl_ctx;	/* SSL context */
 	X509		*ssl_cert;	/* server certificate */
 #  if OPENSSL_VERSION_NUMBER < 0x00909000L
 	SSL_METHOD *ssl_meth;		/* SSL method */
 #  else
 	const SSL_METHOD *ssl_meth;	/* SSL method */
 #  endif
 #endif

 @@ -1,18 +1,17 @@
-# $NetBSD: Makefile,v 1.56 2016/03/05 11:27:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.57 2016/10/20 21:25:57 joerg Exp $
+#
-DISTNAME=	libfetch-2.36
+DISTNAME=	libfetch-2.37
 PKGREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://www.FreeBSD.org/
 COMMENT=	Library to access HTTP/FTP server
 LICENSE=	modified-bsd
 USE_FEATURES=		nbcompat
 USE_BSD_MAKEFILE=	yes