diff options
| author | Ted Zlatanov | 2014-11-25 05:15:23 -0500 |
|---|---|---|
| committer | Ted Zlatanov | 2014-11-25 05:15:23 -0500 |
| commit | 10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a (patch) | |
| tree | fc30c8d1d9f756f4d61ba980b8509d0615930db4 | |
| parent | 6a4dee9b99a720a38725529b10c82f32b2c8528a (diff) | |
| download | emacs-10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a.tar.gz emacs-10f2f8aafa5de5821718cc4a7fc8ed87dfdf895a.zip | |
* gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p.
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/gnutls.c | 2 |
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 @@ | |||
| 1 | 2014-11-25 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 2 | |||
| 3 | * gnutls.c (Fgnutls_peer_status): Check GNUTLS_INITSTAGE, not gnutls_p. | ||
| 4 | |||
| 1 | 2014-11-24 Lars Magne Ingebrigtsen <larsi@gnus.org> | 5 | 2014-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. */ |