aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorTed Zlatanov2014-11-25 05:15:23 -0500
committerTed Zlatanov2014-11-25 05:15:23 -0500
commit10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a (patch)
treefc30c8d1d9f756f4d61ba980b8509d0615930db4 /src
parent6a4dee9b99a720a38725529b10c82f32b2c8528a (diff)
downloademacs-10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a.tar.gz
emacs-10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a.zip
* gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p.
Diffstat (limited to 'src')
-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 @@
12014-11-25 Teodor Zlatanov <tzz@lifelogs.com>
2
3 * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p.
4
12014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> 52014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org>
2 6
3 * gnutls.c: Fix compilation warnings given fix --enable-gcc-warnings. 7 * 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. */)
978 978
979 CHECK_PROCESS (proc); 979 CHECK_PROCESS (proc);
980 980
981 if (XPROCESS (proc)->gnutls_p == 0) 981 if ( GNUTLS_INITSTAGE (proc) < GNUTLS_STAGE_INIT )
982 return Qnil; 982 return Qnil;
983 983
984 /* Then collect any warnings already computed by the handshake. */ 984 /* Then collect any warnings already computed by the handshake. */