1 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 6614375a7c6..8bdc3861f9b 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,11 @@
 2011-04-26  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * gnutls.c (emacs_gnutls_handshake): Don't return a garbage value.
+        Expect the caller to check whether GNUTLS_STAGE_HANDSHAKE_CANDO <=
+        proc->gnutls_initstage, if the check is needed.  The check isn't
+        needed for one caller, Fgnutls_boot.
+        (emacs_gnutls_read): Do that check.  This is the other caller.
+
         lisp.h: Fix a problem with aliasing and vector headers.
         GCC 4.6.0 optimizes based on type-based alias analysis.  For
         example, if b is of type struct buffer * and v of type struct