update proxy.ini

wallproxy · Nov 18, 2013 · 0f0d3a0 · 0f0d3a0
1 parent 0635c36
commit 0f0d3a0
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/local/misc/proxy.pac b/local/misc/proxy.pac
diff --git a/local/proxy.ini b/local/proxy.ini
@@ -92,7 +92,7 @@ notruehttps = .docs.google.com|translate.google.com|play.google.com|books.google
 
 [google_hk]
 mode = https
-hosts = www.google.at|www.google.es|www.google.ca|www.google.com.mx|www.google.com.pa|www.google.gl|www.google.com.gt|www.google.com.bz|www.google.com.sv|www.google.hn
+hosts = www.google.com|www.google.com.hk|mail.google.com|www.google.at|www.google.es|www.google.ca|www.google.com.mx|www.google.com.pa|www.google.gl|www.google.com.gt|www.google.com.bz|www.google.com.sv|www.google.hn
 sites = .appspot.com|.google.com|.google.com.hk|.googlecode.com|.googleusercontent.com|.googlegroups.com|.google-analytics.com|.gstatic.com|.googleapis.com|.blogger.com|.ggpht.com|golang.org
 forcehttps = .appspot.com|.google.com|.google.com.hk|.googlecode.com|.googleusercontent.com|.blogger.com|www.youtube.com
 noforcehttps = books.google.com|translate.google.com|scholar.google.com|feedproxy.google.com|fusion.google.com|picasa.google.com|*pack.google.com|*android.clients.google.com|wenda.google.com.hk|http://www.google.com*/imgres?|http://www.google.com*/translate_t?|http://www.google.com/analytics/|http://wiki.*.googlecode.com/||http://website.*.googlecode.com/|http://www.google.com*/custom?|http://www.google.com/dl/|http://www.google.com/drive/|http://www.google.com*/alerts?
@@ -115,10 +115,10 @@ notruehttps = encrypted.google.com|drive.google.com|plus.google.com
 enable = 1
 ;是否对满足crlf_rules的请求使用crlf功能
 crlf = 1
-crlf_rules = /^https?:\/\/[^\/]+\.c\.youtube\.com\/liveplay\?/ \n /^https?:\/\/upload\.youtube\.com\// \n /^https?:\/\/www\.youtube\.com\/upload\// \n /^https?:\/\/[^\/]+\.googlevideo\.com\// \n /^https?:\/\/www\.youtube\.com\/watch\?/ \n /^https?:\/\/[^\/]+\.c\.youtube\.com\/videoplayback\?/ \n /^https?:\/\/[^\/]+\.youtube\.com/get_video_info\?/ \n /^https?:\/\/[^\/]+\.c\.youtube\.com\/crossdomain\.xml/ \n /^https?:\/\/gdata\.youtube\.com\// \n /^https?:\/\/upload\.facebook\.com\// \n /^https?:\/\/vupload2\.facebook\.com\// \n /^https?:\/\/[^\/]+\.github\.com\//
+crlf_rules = /^https?:\/\/[^\/]+\.c\.youtube\.com\/liveplay\?/ \n /^https?:\/\/upload\.youtube\.com\// \n /^https?:\/\/www\.youtube\.com\/upload\// \n /^https?:\/\/[^\/]+\.googlevideo\.com\/crossdomain\.xml/
-;目前YouTube必须通过FWD发起观看，所以/^https?:\/\/www\.youtube\.com\/watch\?/必须添加到crlf_rules，也即无法再通过删除这条规则解决“上传者已禁止在您的国家/地区播放此视频”
+;如果遇到“上传者已禁止在您的国家/地区播放此视频”的问题，请尝试在crlf_rules中添加或删除 \n /^https?:\/\/www\.youtube\.com\/watch\?/
 ;是否使用远程dns解析[google_xx]hosts或[hosts]中的域名
-dns = 8.8.4.4
+dns = 168.95.1.1
 ;dns = '8.8.8.8', timeout=3, tcp=1, local=0, ipv6=2, port=53
 ;需要由远程dns解析的域名（支持泛域名，优先级低于hosts，泛域名优先级低于完整域名）
 resolve = talk.google.com|talkx.l.google.com|.youtube.com|.facebook.com|.googlevideo.com

diff --git a/local/src.zip/plugins.py b/local/src.zip/plugins.py
@@ -148,7 +148,7 @@ def fetch(self, (params, fetch_args), server=None):
                     opener.close()
                     if isinstance(e, HTTPError):
                         errors.append(str(e))
-                        if e.code in (503, 404):
+                        if e.code in (503, 404, 403):
                             if e.code == 503:
                                 errors[-1] = 'Bandwidth Over Quota(%s)'%self.appids[0]
                             else: