diff options
| author | Simon Josefsson <jas@extundo.com> | 2007-11-05 10:26:16 +0000 |
|---|---|---|
| committer | Simon Josefsson <jas@extundo.com> | 2007-11-05 10:26:16 +0000 |
| commit | 45374a15797743fbf4b9064a989f09b662519703 (patch) | |
| tree | e6bfb78028b810f74841cd84930b5f9009e979c9 /lisp | |
| parent | f081513799e1c21f11c5f9a719352772f753d70b (diff) | |
| download | emacs-45374a15797743fbf4b9064a989f09b662519703.tar.gz | |
net/tls.el (tls-end-of-info): Doc fix.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/net/tls.el | 6 |
2 files changed, 7 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4a3efe09551..b55c3d410b2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,7 @@ +2007-11-05 Simon Josefsson <simon@josefsson.org> + + * net/tls.el (tls-end-of-info): Doc fix. + 2007-11-05 Kenichi Handa <handa@ni.aist.go.jp> * international/utf-7.el (utf-7-imap): New coding system. diff --git a/lisp/net/tls.el b/lisp/net/tls.el index 6beb8680c6e..b263081fe16 100644 --- a/lisp/net/tls.el +++ b/lisp/net/tls.el @@ -65,9 +65,9 @@ ;; `gnutls' regexp. See src/cli.c lines 721-. "^- Simple Client Mode:\n" "\\(\n\\|" ; ignore blank lines - ;; XXX: We have no way of knowing if the STARTTLS handshake sequence - ;; has completed successfully, because `gnutls' will only report - ;; failure. + ;; According to src/cli.c lines 640-650 and 705-715 the handshake + ;; will start after this message. If the handshake fails, the + ;; programs will abort. "^\\*\\*\\* Starting TLS handshake\n\\)*" "\\)") "Regexp matching end of TLS client informational messages. |