[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/url/url-gw.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/url/url-gw.el [lexbind] |
Date: |
Mon, 25 Oct 2004 00:45:20 -0400 |
Index: emacs/lisp/url/url-gw.el
diff -c emacs/lisp/url/url-gw.el:1.3.2.2 emacs/lisp/url/url-gw.el:1.3.2.3
*** emacs/lisp/url/url-gw.el:1.3.2.2 Sat Apr 10 06:27:56 2004
--- emacs/lisp/url/url-gw.el Mon Oct 25 04:19:35 2004
***************
*** 3,9 ****
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;;; Copyright (c) 1997, 1998 Free Software Foundation, Inc.
;;;
;;; This file is part of GNU Emacs.
;;;
--- 3,9 ----
;; Keywords: comm, data, processes
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
! ;;; Copyright (c) 1997, 1998, 2004 Free Software Foundation, Inc.
;;;
;;; This file is part of GNU Emacs.
;;;
***************
*** 29,34 ****
--- 29,35 ----
(autoload 'socks-open-network-stream "socks")
(autoload 'open-ssl-stream "ssl")
+ (autoload 'open-tls-stream "tls")
(defgroup url-gateway nil
"URL gateway variables"
***************
*** 212,217 ****
--- 213,219 ----
Will not make a connexion if `url-gateway-unplugged' is non-nil."
(unless url-gateway-unplugged
(let ((gw-method (if (and url-gateway-local-host-regexp
+ (not (eq 'tls url-gateway-method))
(not (eq 'ssl url-gateway-method))
(string-match
url-gateway-local-host-regexp
***************
*** 242,247 ****
--- 244,251 ----
(let ((coding-system-for-read 'binary)
(coding-system-for-write 'binary))
(setq conn (case gw-method
+ (tls
+ (open-tls-stream name buffer host service))
(ssl
(open-ssl-stream name buffer host service))
((native)