diff options
| author | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2014-12-11 16:57:33 +0100 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen <larsi@gnus.org> | 2014-12-11 16:57:33 +0100 |
| commit | c6f03ed03d68e52e8b18011d2c57959532b45fb5 (patch) | |
| tree | fe49e61ca11b8f25e67bf11a8c9a03ef15c32ee6 /lisp/url | |
| parent | 3e92b9882bc5218a5b5962f9e85d0cbca719afc8 (diff) | |
| download | emacs-c6f03ed03d68e52e8b18011d2c57959532b45fb5.tar.gz | |
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.
Diffstat (limited to 'lisp/url')
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 690f6991910..8ff78ee5b2e 100644 --- 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 34d325acf56..33e333d8e8c 100644 --- 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)) |