diff options
| author | Chong Yidong | 2012-04-10 16:00:43 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-04-10 16:00:43 +0800 |
| commit | e63c261b776f8220e311ef565be4021cdc58e634 (patch) | |
| tree | 69d4f3627afcc5ac7b9c11931d16993a0d079eb0 /src/process.c | |
| parent | 9fce7edaffd9545ae7f8cc1f89fd739df99cdd4a (diff) | |
| parent | 3f1b5bf8616c264c29c2a0259e5213062df4a049 (diff) | |
| download | emacs-e63c261b776f8220e311ef565be4021cdc58e634.tar.gz emacs-e63c261b776f8220e311ef565be4021cdc58e634.zip | |
Merge 2012-04-09 GnuTLS fix from trunk
Diffstat (limited to 'src/process.c')
| -rw-r--r-- | src/process.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/process.c b/src/process.c index f2f33a9eafc..dc43191ebef 100644 --- a/src/process.c +++ b/src/process.c | |||
| @@ -640,7 +640,10 @@ make_process (Lisp_Object name) | |||
| 640 | 640 | ||
| 641 | #ifdef HAVE_GNUTLS | 641 | #ifdef HAVE_GNUTLS |
| 642 | p->gnutls_initstage = GNUTLS_STAGE_EMPTY; | 642 | p->gnutls_initstage = GNUTLS_STAGE_EMPTY; |
| 643 | /* Default log level. */ | ||
| 643 | p->gnutls_log_level = 0; | 644 | p->gnutls_log_level = 0; |
| 645 | /* GnuTLS handshakes attempted for this connection. */ | ||
| 646 | p->gnutls_handshakes_tried = 0; | ||
| 644 | p->gnutls_p = 0; | 647 | p->gnutls_p = 0; |
| 645 | p->gnutls_state = NULL; | 648 | p->gnutls_state = NULL; |
| 646 | p->gnutls_x509_cred = NULL; | 649 | p->gnutls_x509_cred = NULL; |