Fix a problem in url.el without GnuTLS

Fixes: debbugs:19346
* lisp/url/url-http.el (url-http-parse-headers): Check that
`gnutls-available-p' is defined.

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 690f699191050f2f0c18cfc2ef45dc55cb315f98..8ff78ee5b2e5f94553d7e8d57292b5ea219fbebf 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * url-http.el (url-http-parse-headers): Check that
+       `gnutls-available-p' is defined (bug#19346).
+
 2014-12-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
        * url-http.el (url-http-parse-headers): Pass the GnuTLS status of

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 34d325acf56a526b653b9bbfc42d0023ef12cc4e..33e333d8e8cefb2e887101fbe58bc0d9ef8b3bfe 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -495,7 +495,8 @@ should be shown to the user."
                                    (url-port url-current-object)
                                    url-http-process)
   ;; Pass the https certificate on to the caller.
-  (when (gnutls-available-p)
+  (when (and (fboundp 'gnutls-available-p)
+            (gnutls-available-p))
     (let ((status (gnutls-peer-status url-http-process)))
       (when (or status
                (plist-get (car url-callback-arguments) :peer))