From: Magnus Henoch <mange@freemail.hu>
Date: Mon, 16 Oct 2006 14:28:46 +0000 (+0000)
Subject: (url-https-create-secure-wrapper): Always use tls gateway method.
X-Git-Tag: emacs-pretest-22.0.90~109
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=784f5416cf4065b78e263407f08aec509385fbca;p=emacs.git

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

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 2aa14af8983..2d26bc805a7 100644
--- 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 bf8069ded7e..958d90683e4 100644
--- 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))))))