summaryrefslogtreecommitdiff
path: root/lisp/url/url-http.el
diff options
context:
space:
mode:
authorNoam Postavsky <npostavs@gmail.com>2017-07-13 08:52:39 -0400
committerNoam Postavsky <npostavs@gmail.com>2018-06-18 20:01:44 -0400
commit97d5d1a1f4790f959d1bee64e552b492103eddbe (patch)
treed7782d1ae77eae913ae3911ef356de5f233855d8 /lisp/url/url-http.el
parent1d9d35a4e8d6339e064bfe5b1655544e851128ff (diff)
downloademacs-97d5d1a1f4790f959d1bee64e552b492103eddbe.tar.gz
emacs-97d5d1a1f4790f959d1bee64e552b492103eddbe.tar.bz2
emacs-97d5d1a1f4790f959d1bee64e552b492103eddbe.zip
Move tls.el and starttls.el to lisp/obsolete/ (Bug#31457)
* lisp/obsolete/tls.el: Moved from lisp/net/tls.el. * lisp/gnus/nnimap.el: * lisp/url/url-http.el: Don't require tls, since it's obsolete. * lisp/net/network-stream.el: Only require tls if we actually try to use it (i.e., when (gnutls-available-p) returns nil). Declare some functions to fix compilation warnings. * lisp/obsolete/starttls.el: Moved from lisp/net/starttls.el. * lisp/net/sieve-manage.el: * lisp/net/network-stream.el: Don't require `starttls' at the top-level, declare the variables and functions used instead. (network-stream-open-starttls): Only require `starttls' if needed (i.e., gnutls-available-p fails). * etc/NEWS: Announce obsoletion.
Diffstat (limited to 'lisp/url/url-http.el')
-rw-r--r--lisp/url/url-http.el1
1 files changed, 0 insertions, 1 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 0b95453b300..53798f77c39 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1600,7 +1600,6 @@ p3p
;; HTTPS. This used to be in url-https.el, but that file collides
;; with url-http.el on systems with 8-character file names.
-(require 'tls)
(defconst url-https-asynchronous-p t "HTTPS retrievals are asynchronous.")