update pac gwflist, support remote PAC

WinterXMQ · Jul 29, 2015 · f3465ef · f3465ef
1 parent f4d8a40
commit f3465ef
Show file tree

Hide file tree

Showing 3 changed files with 3,486 additions and 3,384 deletions.
diff --git a/gae_proxy/local/pac_server.py b/gae_proxy/local/pac_server.py
@@ -59,8 +59,8 @@ def update_pacfile(filename):
         opener = get_opener()
 
         listen_ip = config.LISTEN_IP
-        autoproxy = '%s:%s' % (listen_ip, config.LISTEN_PORT)
-        blackhole = '%s:%s' % (listen_ip, config.PAC_PORT)
+        autoproxy = gae_proxy_listen
+        blackhole = pac_listen
         default = 'DIRECT'
 
         if config.PAC_ADBLOCK:
@@ -325,7 +325,8 @@ def do_GET(self):
         with open(pac_filename, 'rb') as fp:
             data = fp.read()
 
-        host, _, port = self.path.rpartition(':')
+        host = self.headers.getheader('Host')
+        host, _, port = host.rpartition(":")
         gae_proxy_proxy = host + ":" + str(config.LISTEN_PORT)
         pac_proxy = host + ":" + str(config.PAC_PORT)
         data = data.replace(gae_proxy_listen, gae_proxy_proxy)

diff --git a/gae_proxy/local/proxy.ini b/gae_proxy/local/proxy.ini
@@ -60,7 +60,7 @@ enable = 1
 ip = 127.0.0.1
 port = 8086
 file = proxy.pac
-gfwlist = http://autoproxy-gfwlist.googlecode.com/svn/trunk/gfwlist.txt
+gfwlist = https://raw.githubusercontent.com/gfwlist/gfwlist/master/gfwlist.txt
 ;adblock = http://adblock-chinalist.googlecode.com/svn/trunk/adblock.txt
 ; this project have stopped.
 expired = 86400