Fix a bug recently introduced in wgnutls_peek.

[wget] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 9d08bc6bef5f0fa0e5ab02219bc499f98308a931..fb42a5441d5c8916bab94da9411f17aba95de31b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,29 @@
+2011-04-07  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * gnutls.c (wgnutls_peek): New local variable `read'.
+       Use `read' instead of `ret' to store the number of read bytes.
+       Reported by: Ray Satiro <raysatiro@yahoo.com>
+
+2011-04-04  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * openssl.c [WINDOWS]: Include <w32sock.h>.
+       (openssl_read): Retry the read on SSL_ERROR_WANT_READ.
+
+       * host.c [WINDOWS]: Include <winsock2.h> and <ws2tcpip.h>.
+       Suggested by: Ray Satiro <raysatiro@yahoo.com>.
+
+       * Makefile.am (LIBS): Remove  @LIBSSL@ @W32LIBS@
+
+2011-04-03  Giuseppe Scrivano  <gscrivano@gnu.org>
+
+       * gnutls.c: Include <fcntl.h>.
+       (wgnutls_peek): Make the socket non blocking before attempt a read.
+
+       * gnutls.c: Include <sys/ioctl.h>.
+       (wgnutls_peek) [F_GETFL]: Use fcntl.
+       (wgnutls_peek) [! F_GETFL]: Use ioctl.
+
+
 2011-03-31  Giuseppe Scrivano  <gscrivano@gnu.org>
 
        * recur.c (download_child_p): When --no-parent is used, check that the