bump version to 3.1.13

oahxu · May 27, 2014 · f31ac9d · f31ac9d
1 parent fdca445
commit f31ac9d
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/local/proxy.ini b/local/proxy.ini
@@ -12,7 +12,7 @@ password =
 path = /2
 mode = https
 profile = ipv4
-window = 4
+window = 6
 keepalive = 0
 obfuscate = 0
 validate = 0
@@ -22,7 +22,7 @@ regions =
 
 [iplist]
 google_cn = www.google.cn|www.g.cn
-google_hk = www.google.com|mail.google.com|www.google.com.hk|www.google.com.tw|www.l.google.com
+google_hk = www.google.com|mail.google.com|www.google.com.hk|www.google.com.tw|www1.l.google.com|www2.l.google.com|www3.l.google.com|www4.l.google.com|www5.l.google.com|www6.l.google.com|www.l.google.com|mail.l.google.com|googleapis.l.google.com|googlecode.l.googleusercontent.com|maps.l.google.com|code.l.google.com
 google_talk =talk.google.com|talk.l.google.com|talkx.l.google.com
 google_ipv6 = 2404:6800:4005:c00::64|2404:6800:4005:c00::65|2404:6800:4005:c00::5e|2404:6800:4005:c00::67|2404:6800:4005:c00::2f
 ;google_tw = www.google.com.tw|www.google.com.sg|www.google.co.jp|www.google.sg|www.google.cat|mail.google.com|mail.l.google.com

diff --git a/local/proxy.py b/local/proxy.py
@@ -41,7 +41,7 @@
 #      v3aqb             <[email protected]>
 #      Oling Cat         <[email protected]>
 
-__version__ = '3.1.12'
+__version__ = '3.1.13'
 
 import sys
 import os
@@ -1999,12 +1999,13 @@ def __init__(self):
 
     def resolve_iplist(self):
         def do_resolve(host, dnsservers, queue):
-            try:
-                iplist = dnslib_record2iplist(dnslib_resolve_over_udp(host, dnsservers, timeout=2, blacklist=self.DNS_BLACKLIST))
-                queue.put((host, dnsservers, iplist or []))
-            except (socket.error, OSError) as e:
-                logging.warning('resolve remote host=%r failed: %s', host, e)
-                queue.put((host, dnsservers, []))
+            iplist = []
+            for dnslib_resolve in (dnslib_resolve_over_udp, dnslib_resolve_over_tcp):
+                try:
+                    iplist += dnslib_record2iplist(dnslib_resolve_over_udp(host, dnsservers, timeout=2, blacklist=self.DNS_BLACKLIST))
+                except (socket.error, OSError) as e:
+                    logging.warning('%r remote host=%r failed: %s', dnslib_resolve, host, e)
+            queue.put((host, dnsservers, iplist))
         # https://support.google.com/websearch/answer/186669?hl=zh-Hans
         google_blacklist = ['216.239.32.20'] + list(self.DNS_BLACKLIST)
         for name, need_resolve_hosts in list(self.IPLIST_MAP.items()):