diff options
| -rw-r--r-- | lisp/url/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/url/url-http.el | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog index 8ff78ee5b2e..4091d2eb722 100644 --- a/lisp/url/ChangeLog +++ b/lisp/url/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-12-12 Lars Magne Ingebrigtsen <larsi@gnus.org> | ||
| 2 | |||
| 3 | * url-http.el (url-http-parse-headers): `gnutls-available-p' is | ||
| 4 | now always available. | ||
| 5 | |||
| 1 | 2014-12-11 Lars Magne Ingebrigtsen <larsi@gnus.org> | 6 | 2014-12-11 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 7 | ||
| 3 | * url-http.el (url-http-parse-headers): Check that | 8 | * url-http.el (url-http-parse-headers): Check that |
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 33e333d8e8c..34d325acf56 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el | |||
| @@ -495,8 +495,7 @@ should be shown to the user." | |||
| 495 | (url-port url-current-object) | 495 | (url-port url-current-object) |
| 496 | url-http-process) | 496 | url-http-process) |
| 497 | ;; Pass the https certificate on to the caller. | 497 | ;; Pass the https certificate on to the caller. |
| 498 | (when (and (fboundp 'gnutls-available-p) | 498 | (when (gnutls-available-p) |
| 499 | (gnutls-available-p)) | ||
| 500 | (let ((status (gnutls-peer-status url-http-process))) | 499 | (let ((status (gnutls-peer-status url-http-process))) |
| 501 | (when (or status | 500 | (when (or status |
| 502 | (plist-get (car url-callback-arguments) :peer)) | 501 | (plist-get (car url-callback-arguments) :peer)) |