Mercurial > emacs
comparison lisp/net/tls.el @ 90789:c0409ee15cee
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 670-674)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 209-210)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-185
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Wed, 21 Mar 2007 13:33:07 +0000 |
| parents | dd7c098af727 a4570ccecc89 |
| children | 4ef881a120fe |
comparison
equal
deleted
inserted
replaced
| 90788:a12805fdabe8 | 90789:c0409ee15cee |
|---|---|
| 58 (defcustom tls-program '("gnutls-cli -p %p %h" | 58 (defcustom tls-program '("gnutls-cli -p %p %h" |
| 59 "gnutls-cli -p %p %h --protocols ssl3" | 59 "gnutls-cli -p %p %h --protocols ssl3" |
| 60 "openssl s_client -connect %h:%p -no_ssl2") | 60 "openssl s_client -connect %h:%p -no_ssl2") |
| 61 "List of strings containing commands to start TLS stream to a host. | 61 "List of strings containing commands to start TLS stream to a host. |
| 62 Each entry in the list is tried until a connection is successful. | 62 Each entry in the list is tried until a connection is successful. |
| 63 %s is replaced with server hostname, %p with port to connect to. | 63 %h is replaced with server hostname, %p with port to connect to. |
| 64 The program should read input on stdin and write output to | 64 The program should read input on stdin and write output to |
| 65 stdout. Also see `tls-success' for what the program should output | 65 stdout. Also see `tls-success' for what the program should output |
| 66 after successful negotiation." | 66 after successful negotiation." |
| 67 :type '(repeat string) | 67 :type '(repeat string) |
| 68 :version "22.1" | 68 :version "22.1" |
| 144 (memq (process-status process) '(open run)) | 144 (memq (process-status process) '(open run)) |
| 145 (save-excursion | 145 (save-excursion |
| 146 (set-buffer buffer) ;; XXX "blue moon" nntp.el bug | 146 (set-buffer buffer) ;; XXX "blue moon" nntp.el bug |
| 147 (goto-char (point-min)) | 147 (goto-char (point-min)) |
| 148 (not (setq done (re-search-forward tls-success nil t))))) | 148 (not (setq done (re-search-forward tls-success nil t))))) |
| 149 (accept-process-output process 1) | 149 (unless (accept-process-output process 1) |
| 150 (sit-for 1)) | 150 (sit-for 1))) |
| 151 (message "Opening TLS connection with `%s'...%s" cmd | 151 (message "Opening TLS connection with `%s'...%s" cmd |
| 152 (if done "done" "failed")) | 152 (if done "done" "failed")) |
| 153 (if done | 153 (if done |
| 154 (setq done process) | 154 (setq done process) |
| 155 (delete-process process)))) | 155 (delete-process process)))) |