Merge pull request #2401 from tomahock/master

stamparm · web-flow · commit 4d3aa1605c70 · 2017-02-19T01:31:12.000+01:00
Fix proxyFile regex to properly match an address with a -
diff --git a/lib/core/option.py b/lib/core/option.py
@@ -2324,7 +2324,7 @@ def _setProxyList():
         return
 
     conf.proxyList = []
-    for match in re.finditer(r"(?i)((http[^:]*|socks[^:]*)://)?([\w.]+):(\d+)", readCachedFileContent(conf.proxyFile)):
+    for match in re.finditer(r"(?i)((http[^:]*|socks[^:]*)://)?([\w\-.]+):(\d+)", readCachedFileContent(conf.proxyFile)):
         _, type_, address, port = match.groups()
         conf.proxyList.append("%s://%s:%s" % (type_ or "http", address, port))
 
