Mercurial > emacs
comparison lisp/url/url-vars.el @ 57449:202c408c174b
url-vars.el (url-gateway-method): Add new method `tls'.
url-news.el (url-snews): Use nntp-open-tls-stream if
url-gateway-method is tls.
url-ldap.el (url-ldap-certificate-formatter): Use
tls-certificate-information if ssl.el is not available.
url-https.el (url-https-create-secure-wrapper): Use tls if ssl
is not available.
url-gw.el (url-open-stream): Support tls url-gateway-method.
(url-open-stream): Likewise.
author | Simon Josefsson <jas@extundo.com> |
---|---|
date | Tue, 12 Oct 2004 09:55:08 +0000 |
parents | 01934125951e |
children | c386726e02a5 e86fc76a45e4 |
comparison
equal
deleted
inserted
replaced
57448:821d95294db5 | 57449:202c408c174b |
---|---|
1 ;;; url-vars.el --- Variables for Uniform Resource Locator tool | 1 ;;; url-vars.el --- Variables for Uniform Resource Locator tool |
2 ;; Keywords: comm, data, processes, hypermedia | 2 ;; Keywords: comm, data, processes, hypermedia |
3 | 3 |
4 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; | 4 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; |
5 ;;; Copyright (c) 1996,1997,1998,1999,2001 Free Software Foundation, Inc. | 5 ;;; Copyright (c) 1996,1997,1998,1999,2001,2004 Free Software Foundation, Inc. |
6 ;;; | 6 ;;; |
7 ;;; This file is part of GNU Emacs. | 7 ;;; This file is part of GNU Emacs. |
8 ;;; | 8 ;;; |
9 ;;; GNU Emacs is free software; you can redistribute it and/or modify | 9 ;;; GNU Emacs is free software; you can redistribute it and/or modify |
10 ;;; it under the terms of the GNU General Public License as published by | 10 ;;; it under the terms of the GNU General Public License as published by |
366 | 366 |
367 Currently supported methods: | 367 Currently supported methods: |
368 `telnet': Run telnet in a subprocess to connect; | 368 `telnet': Run telnet in a subprocess to connect; |
369 `rlogin': Rlogin to another machine to connect; | 369 `rlogin': Rlogin to another machine to connect; |
370 `socks': Connect through a socks server; | 370 `socks': Connect through a socks server; |
371 `ssl': Connect with SSL; | 371 `tls': Connect with TLS; |
372 `ssl': Connect with SSL (deprecated, use `tls' instead); | |
372 `native': Connect directy." | 373 `native': Connect directy." |
373 :type '(radio (const :tag "Telnet to gateway host" :value telnet) | 374 :type '(radio (const :tag "Telnet to gateway host" :value telnet) |
374 (const :tag "Rlogin to gateway host" :value rlogin) | 375 (const :tag "Rlogin to gateway host" :value rlogin) |
375 (const :tag "Use SOCKS proxy" :value socks) | 376 (const :tag "Use SOCKS proxy" :value socks) |
376 (const :tag "Use SSL for all connections" :value ssl) | 377 (const :tag "Use SSL/TLS for all connections" :value tls) |
378 (const :tag "Use SSL for all connections (obsolete)" :value ssl) | |
377 (const :tag "Direct connection" :value native)) | 379 (const :tag "Direct connection" :value native)) |
378 :group 'url-hairy) | 380 :group 'url-hairy) |
379 | 381 |
380 (defvar url-setup-done nil "Has setup configuration been done?") | 382 (defvar url-setup-done nil "Has setup configuration been done?") |
381 | 383 |