changeset 73390:3289ed0d2f0c

(url-https-create-secure-wrapper): Always use tls gateway method.
author Magnus Henoch <mange@freemail.hu>
date Mon, 16 Oct 2006 14:28:46 +0000
parents 7b5c0104efb0
children d636f1f6f544
files lisp/url/ChangeLog lisp/url/url-http.el
diffstat 2 files changed, 6 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/lisp/url/ChangeLog	Mon Oct 16 14:20:38 2006 +0000
+++ b/lisp/url/ChangeLog	Mon Oct 16 14:28:46 2006 +0000
@@ -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
--- a/lisp/url/url-http.el	Mon Oct 16 14:20:38 2006 +0000
+++ b/lisp/url/url-http.el	Mon Oct 16 14:28:46 2006 +0000
@@ -1261,9 +1261,7 @@
 (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))))))