(url-https-create-secure-wrapper): Always use tls gateway method.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2aa14af89830a9f0389b046e8ce0d921383d5a52..2d26bc805a7bdb2f352d80ff593150db42df528e 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-16  Magnus Henoch  <mange@freemail.hu>
+
+       * url-http.el (url-https-create-secure-wrapper): Always use tls
+       gateway method.
+
 2006-10-12  Magnus Henoch  <mange@freemail.hu>
 
        * url-http.el (url-http-find-free-connection): Handle

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index bf8069ded7ebd303b61ed55ba9875a577a769de8..958d90683e48fa21a74c1f0430a2e43a32dae648 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1261,9 +1261,7 @@ p3p
 (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))))
+    (let ((url-gateway-method 'tls))
       (,(intern (format (if method "url-http-%s" "url-http") method))
        ,@(remove '&rest (remove '&optional args))))))