From fb836fcf6f2b40e557b5416eeccedd96ad4d3e5f Mon Sep 17 00:00:00 2001 From: rllola Date: Sat, 9 Mar 2019 18:41:50 +0100 Subject: [PATCH 1/2] If no port defined in tracker url assume it is port 80; fix #1917 --- src/Site/SiteAnnouncer.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/Site/SiteAnnouncer.py b/src/Site/SiteAnnouncer.py index 484d48fb..c0c575dc 100644 --- a/src/Site/SiteAnnouncer.py +++ b/src/Site/SiteAnnouncer.py @@ -172,7 +172,11 @@ class SiteAnnouncer(object): if "://" not in tracker or not re.match("^[A-Za-z0-9:/\\.#-]+$", tracker): return None protocol, address = tracker.split("://", 1) - ip, port = address.rsplit(":", 1) + try: + ip, port = address.rsplit(":", 1) + except ValueError as err: + ip = address + port = 80 back = {} back["protocol"] = protocol back["address"] = address From 58516913b446c7dd7f02a903e1522c205d6f53cf Mon Sep 17 00:00:00 2001 From: rllola Date: Sun, 10 Mar 2019 22:19:37 +0100 Subject: [PATCH 2/2] if protocol https choose port 443 --- src/Site/SiteAnnouncer.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Site/SiteAnnouncer.py b/src/Site/SiteAnnouncer.py index c0c575dc..48a05e69 100644 --- a/src/Site/SiteAnnouncer.py +++ b/src/Site/SiteAnnouncer.py @@ -177,6 +177,8 @@ class SiteAnnouncer(object): except ValueError as err: ip = address port = 80 + if protocol.startswith("https"): + port = 443 back = {} back["protocol"] = protocol back["address"] = address