[Emacs-diffs] Changes to emacs/lisp/url/url-https.el

[Simon Josefsson]

Index: emacs/lisp/url/url-https.el
diff -c emacs/lisp/url/url-https.el:1.5 emacs/lisp/url/url-https.el:1.6
*** emacs/lisp/url/url-https.el:1.5     Fri Apr 16 22:02:46 2004
--- emacs/lisp/url/url-https.el Tue Oct 12 09:55:08 2004
***************
*** 1,4 ****
! ;;; url-https.el --- HTTP over SSL routines
  
  ;; Copyright (c) 1999, 2004 Free Software Foundation, Inc.
  
--- 1,4 ----
! ;;; url-https.el --- HTTP over SSL/TLS routines
  
  ;; Copyright (c) 1999, 2004 Free Software Foundation, Inc.
  
***************
*** 30,35 ****
--- 30,36 ----
  (require 'url-parse)
  (require 'url-cookie)
  (require 'url-http)
+ (require 'tls)
  
  (defconst url-https-default-port 443 "Default HTTPS port.")
  (defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.")
***************
*** 38,49 ****
  (defmacro url-https-create-secure-wrapper (method args)
    `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) 
,args
      ,(format "HTTPS wrapper around `%s' call." (or method "url-http"))
!     (condition-case ()
!       (require 'ssl)
!       (error
!        (error "HTTPS support could not find `ssl' library")))
!     (let ((url-gateway-method 'ssl))
!       ( ,(intern (format (if method "url-http-%s" "url-http") method)) 
,@(remove '&rest (remove '&optional args))))))
  
  (url-https-create-secure-wrapper nil (url callback cbargs))
  (url-https-create-secure-wrapper file-exists-p (url))
--- 39,49 ----
  (defmacro url-https-create-secure-wrapper (method args)
    `(defun ,(intern (format (if method "url-https-%s" "url-https") method)) 
,args
      ,(format "HTTPS wrapper around `%s' call." (or method "url-http"))
!     (let ((url-gateway-method (condition-case ()
!                                 (require 'ssl)
!                               (error 'tls))))
!       (,(intern (format (if method "url-http-%s" "url-http") method))
!        ,@(remove '&rest (remove '&optional args))))))
  
  (url-https-create-secure-wrapper nil (url callback cbargs))
  (url-https-create-secure-wrapper file-exists-p (url))