comparison lisp/url/url-https.el @ 83219:e86fc76a45e4

Merged in changes from CVS trunk. Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-611 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-612 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-613 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-614 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-615 Merge from gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-46 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-47 Merge from emacs--cvs-trunk--0 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-48 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-49 Add {arch}/=commit-merge-make-log * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-50 {arch}/=commit-merge-make-log: Don't die if there are no ChangeLog changes git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-259
author Karoly Lorentey <lorentey@elte.hu>
date Thu, 14 Oct 2004 14:42:03 +0000
parents 625059157bad 202c408c174b
children 6c13700d1c13
comparison
equal deleted inserted replaced
83218:47f53c5c9620 83219:e86fc76a45e4
1 ;;; url-https.el --- HTTP over SSL routines 1 ;;; url-https.el --- HTTP over SSL/TLS routines
2 2
3 ;; Copyright (c) 1999, 2004 Free Software Foundation, Inc. 3 ;; Copyright (c) 1999, 2004 Free Software Foundation, Inc.
4 4
5 ;; Keywords: comm, data, processes 5 ;; Keywords: comm, data, processes
6 6
28 (require 'url-gw) 28 (require 'url-gw)
29 (require 'url-util) 29 (require 'url-util)
30 (require 'url-parse) 30 (require 'url-parse)
31 (require 'url-cookie) 31 (require 'url-cookie)
32 (require 'url-http) 32 (require 'url-http)
33 (require 'tls)
33 34
34 (defconst url-https-default-port 443 "Default HTTPS port.") 35 (defconst url-https-default-port 443 "Default HTTPS port.")
35 (defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.") 36 (defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.")
36 (defalias 'url-https-expand-file-name 'url-http-expand-file-name) 37 (defalias 'url-https-expand-file-name 'url-http-expand-file-name)
37 38
38 (defmacro url-https-create-secure-wrapper (method args) 39 (defmacro url-https-create-secure-wrapper (method args)
39 `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args 40 `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) ,args
40 ,(format "HTTPS wrapper around `%s' call." (or method "url-http")) 41 ,(format "HTTPS wrapper around `%s' call." (or method "url-http"))
41 (condition-case () 42 (let ((url-gateway-method (condition-case ()
42 (require 'ssl) 43 (require 'ssl)
43 (error 44 (error 'tls))))
44 (error "HTTPS support could not find `ssl' library"))) 45 (,(intern (format (if method "url-http-%s" "url-http") method))
45 (let ((url-gateway-method 'ssl)) 46 ,@(remove '&rest (remove '&optional args))))))
46 ( ,(intern (format (if method "url-http-%s" "url-http") method)) ,@(remove '&rest (remove '&optional args))))))
47 47
48 (url-https-create-secure-wrapper nil (url callback cbargs)) 48 (url-https-create-secure-wrapper nil (url callback cbargs))
49 (url-https-create-secure-wrapper file-exists-p (url)) 49 (url-https-create-secure-wrapper file-exists-p (url))
50 (url-https-create-secure-wrapper file-readable-p (url)) 50 (url-https-create-secure-wrapper file-readable-p (url))
51 (url-https-create-secure-wrapper file-attributes (url &optional id-format)) 51 (url-https-create-secure-wrapper file-attributes (url &optional id-format))