emo/xbps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

lib/fetch/common.c: merge 2.34 and backport a patch for select(2) and SSL.

Browse Source
This commit is contained in:
Juan RP 2013-01-13 21:09:15 +01:00
parent 336897d964
commit 2f3913f3aa
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/fetch/common.c
View File

@ -316,6 +316,7 @@ fetch_connect(struct url *url, int af, int verbose)
if ((conn = fetch_reopen(sd)) == NULL) { if ((conn = fetch_reopen(sd)) == NULL) {
fetch_syserr(); fetch_syserr();
close(sd); close(sd);
return NULL;
} }
conn->cache_url = fetchCopyURL(url); conn->cache_url = fetchCopyURL(url);
conn->cache_af = af; conn->cache_af = af;
@ -529,6 +530,10 @@ fetch_read(conn_t *conn, char *buf, size_t len)
return (-1); return (-1);
} }
errno = 0; errno = 0;
#ifdef WITH_SSL
if (conn->ssl && SSL_pending(conn->ssl))
break;
#endif
r = select(conn->sd + 1, &readfds, NULL, NULL, &waittv); r = select(conn->sd + 1, &readfds, NULL, NULL, &waittv);
if (r == -1) { if (r == -1) {
if (errno == EINTR && fetchRestartCalls) if (errno == EINTR && fetchRestartCalls)