summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/ChangeLog4
-rw-r--r--src/gnutls.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 448de36eb05..220c2bfd771 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2014-11-25 Teodor Zlatanov <tzz@lifelogs.com>
+
+ * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p.
+
2014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings.
diff --git a/src/gnutls.c b/src/gnutls.c
index dd9c8015ca1..bfa6078eabd 100644
--- a/src/gnutls.c
+++ b/src/gnutls.c
@@ -978,7 +978,7 @@ The return value is a property list. */)
CHECK_PROCESS (proc);
- if (XPROCESS (proc)->gnutls_p == 0)
+ if ( GNUTLS_INITSTAGE (proc) < GNUTLS_STAGE_INIT )
return Qnil;
/* Then collect any warnings already computed by the handshake. */