moparisthebest/wget
1
0
Fork 0
mirror of https://github.com/moparisthebest/wget synced 2024-07-03 16:38:41 -04:00
Code Issues Releases Wiki Activity

gnutls: use the blocking socket.

Browse Source
This commit is contained in:
Giuseppe Scrivano 2011-04-19 14:40:21 +02:00
parent 87a176daa7
commit 366dbedf1b
2 changed files with 11 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ChangeLog
View File

@ -1,5 +1,9 @@
2011-04-19 Giuseppe Scrivano <gscrivano@gnu.org> 2011-04-19 Giuseppe Scrivano <gscrivano@gnu.org>
* gnutls.c: Do not include <fcntl.h>.
* gnutls.c (wgnutls_peek): Ensure there is data available before attempt
a read on the blocking socket.
* Makefile.am (LIBS): Add $(LIB_CLOCK_GETTIME) * Makefile.am (LIBS): Add $(LIB_CLOCK_GETTIME)
* utils.c: Include <sys/stat.h>. Do not include <sys/time.h>. * utils.c: Include <sys/stat.h>. Do not include <sys/time.h>.
(touch): Use `futimens' instead of `utimes'. (touch): Use `futimens' instead of `utimes'.

33
src/gnutls.c
View File

@ -40,7 +40,6 @@ as that of the covered work. */
#include <gnutls/gnutls.h> #include <gnutls/gnutls.h>
#include <gnutls/x509.h> #include <gnutls/x509.h>
#include <fcntl.h>
#include <sys/ioctl.h> #include <sys/ioctl.h>
#include "utils.h" #include "utils.h"
@ -186,24 +185,13 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
if (bufsize > offset) if (bufsize > offset)
{ {
#ifdef F_GETFL if (gnutls_record_check_pending (ctx->session) <= 0
int flags; && select_fd (fd, 0.0, WAIT_FOR_READ) <= 0)
flags = fcntl (fd, F_GETFL, 0); read = 0;
if (flags < 0) else
return ret;
ret = fcntl (fd, F_SETFL, flags | O_NONBLOCK);
if (ret < 0)
return ret;
#else
/* XXX: Assume it was blocking before. */
const int one = 1;
ret = ioctl (fd, FIONBIO, &one);
if (ret < 0)
return ret;
#endif
read = gnutls_record_recv (ctx->session, buf + offset, read = gnutls_record_recv (ctx->session, buf + offset,
bufsize - offset); bufsize - offset);
if (read < 0) if (read < 0)
{ {
if (offset) if (offset)
@ -218,17 +206,6 @@ wgnutls_peek (int fd, char *buf, int bufsize, void *arg)
read); read);
ctx->peeklen += read; ctx->peeklen += read;
} }
#ifdef F_GETFL
ret = fcntl (fd, F_SETFL, flags);
if (ret < 0)
return ret;
#else
const int zero = 0;
ret = ioctl (fd, FIONBIO, &zero);
if (ret < 0)
return ret;
#endif
} }
return offset + read; return offset + read;