[nongnu] elpa/mentor f51dd4f3f8 2/2: Prefer HTTPS to HTTP

[ELPA Syncer]

branch: elpa/mentor
commit f51dd4f3f87c54b7cc92189924b9d873a53f5a75
Author: Stefan Kangas <stefankangas@gmail.com>
Commit: Stefan Kangas <stefankangas@gmail.com>

    Prefer HTTPS to HTTP
---
 README.org           | 4 ++--
 mentor.el            | 4 ++--
 test/mentor-tests.el | 5 ++++-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/README.org b/README.org
index 99490c89e6..3fcbb3dc0e 100644
--- a/README.org
+++ b/README.org
@@ -2,7 +2,7 @@
 
 
[[https://elpa.nongnu.org/nongnu/mentor.html][https://elpa.nongnu.org/nongnu/mentor.svg]]
 
-mentor is a [[https://www.gnu.org/software/emacs][GNU Emacs]] frontend for the 
[[http://libtorrent.rakshasa.no/][rTorrent]] bittorrent client.
+mentor is a [[https://www.gnu.org/software/emacs][GNU Emacs]] frontend for the 
[[https://rakshasa.github.io/rtorrent/][rTorrent]] bittorrent client.
 
 By default, it will start and run rTorrent from within Emacs but can also be
 configured to use an external rTorrent instance over XML-RPC.
@@ -124,7 +124,7 @@ It is also possible to connect to rtorrent over http.  
There are instructions on
 configuring this on the 
[[https://github.com/rakshasa/rtorrent/wiki/RPC-Setup-XMLRPC][rtorrent wiki]].
 
 : ;; Alternative 3: Use a web server
-: (setq mentor-rtorrent-external-rpc "http://127.0.0.1:8080/RPC2";)
+: (setq mentor-rtorrent-external-rpc "https://127.0.0.1:8080/RPC2";)
 
 Finally, you can connect directly to rtorrent over scgi.  However, anyone that
 can send rtorrent xmlrpc requests can in all likelihood also execute arbitrary
diff --git a/mentor.el b/mentor.el
index 2096393434..1caa21bf8f 100644
--- a/mentor.el
+++ b/mentor.el
@@ -138,7 +138,7 @@ To connect using a local socket file, use
 start the path with `/' or '~' for it to be recognized as a file
 socket.
 
-To connect using http, use `http://HOST[:PORT]/PATH'.  This would
+To connect using HTTPS, use `https://HOST[:PORT]/PATH'.  This would
 be the case when using a web server in front of rTorrent.
 
 For security reasons, we strongly suggest to use one of the
@@ -148,7 +148,7 @@ scgi_port by specifying `scgi://HOST:PORT'.
 Example values:
 
  (1) ~/.rtorrent-rpc.socket
- (2) http://localhost:8080/RPC2
+ (2) https://localhost:8080/RPC2
  (3) scgi://localhost:5000 [not recommended]"
   :package-version '(mentor . "0.2")
   :group 'mentor
diff --git a/test/mentor-tests.el b/test/mentor-tests.el
index 4776c5e891..b3f772e6e0 100644
--- a/test/mentor-tests.el
+++ b/test/mentor-tests.el
@@ -34,6 +34,7 @@
   (should (equal (mentor-normalize-rpc-url "scgi://~/.rtorrent.rpc")       
"scgi://~/.rtorrent.rpc"))
   (should (equal (mentor-normalize-rpc-url "scgi:///path/to/rtorrent.rpc") 
"scgi:///path/to/rtorrent.rpc"))
   (should (equal (mentor-normalize-rpc-url "http://localhost:8080/RPC";)    
"http://localhost:8080/RPC";))
+  (should (equal (mentor-normalize-rpc-url "https://localhost:8080/RPC";)   
"https://localhost:8080/RPC";))
   ;; Add scgi
   (should (equal (mentor-normalize-rpc-url "~/.rtorrent.rpc")       
"scgi://~/.rtorrent.rpc"))
   (should (equal (mentor-normalize-rpc-url "/path/to/rtorrent.rpc") 
"scgi:///path/to/rtorrent.rpc")))
@@ -54,7 +55,9 @@
 
 (ert-deftest mentor-rtorrent-keep-domain-name ()
   (should (equal (mentor-keep-domain-name "http://foo.bar1.com/announce?xxxx";)
-                 "foo.bar1.com")))
+                 "foo.bar1.com"))
+  (should (equal (mentor-keep-domain-name "https://baz.bar2.com/announce?xxxx";)
+                 "baz.bar2.com")))
 
 (ert-deftest mentor-remove-subdomains ()
   (should (equal (mentor-remove-subdomains "foo.bar.baz.com") "baz.com"))