* url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 4c4af45b1c22f471f68878a1281eaabf8bb943b5..4ef2b42756bcf490d196543a8d78e76614f0248a 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,7 @@
+2010-10-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * url-gw.el (url-open-stream): Use open-gnutls-stream if it exists.
+
 2010-10-07  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * url-http.el (url-http-end-of-document-sentinel): Protect against

diff --git a/lisp/url/url-gw.el b/lisp/url/url-gw.el
index 714d12f3f1095dfac9e91eec23b641ee47256794..4358255bde5cb1a12fe0e2a97613d9a723747e2c 100644 (file)
--- a/lisp/url/url-gw.el
+++ b/lisp/url/url-gw.el
@@ -245,7 +245,10 @@ Might do a non-blocking connection; use `process-status' to check."
                (coding-system-for-write 'binary))
            (setq conn (case gw-method
                         (tls
-                         (open-tls-stream name buffer host service))
+                         (funcall (if (fboundp 'open-gnutls-stream)
+                                      'open-gnutls-stream
+                                    'open-tls-stream)
+                                  name buffer host service))
                         (ssl
                          (open-ssl-stream name buffer host service))
                         ((native)