Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull #1

Open
wants to merge 70 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
70 commits
Select commit Hold shift + click to select a range
a8fa8b2
support user defined rules; close #2
clowwindy Mar 18, 2014
6509aea
update readme
clowwindy Mar 18, 2014
73032f8
add performance test
clowwindy Mar 18, 2014
fa06252
add performance test
clowwindy Mar 18, 2014
f651a30
add performance test
clowwindy Mar 18, 2014
f8d9e66
fix avg result in performance test
clowwindy Mar 18, 2014
c6f53aa
20% faster
clowwindy Mar 18, 2014
ae3ee4a
reduce invalid entries using tld data
clowwindy Mar 18, 2014
6d21bf2
bump version
clowwindy Mar 18, 2014
082c364
add comparison test with switchysharp pac
clowwindy Mar 18, 2014
81b694e
add comparison test with switchysharp pac
clowwindy Mar 18, 2014
02ab75e
add comparison test with switchysharp pac
clowwindy Mar 18, 2014
313aba9
download gfwlist if -i option is not provided; close #4
clowwindy Mar 19, 2014
01e14d7
Update proxy.pac
clowwindy Mar 22, 2014
5190b4a
add googleapis.com
clowwindy Mar 28, 2014
ad9ca2e
Merge remote-tracking branch 'origin/master'
clowwindy Mar 28, 2014
224a7b8
update test
clowwindy Mar 28, 2014
b5900fd
Update README.md
clowwindy Apr 7, 2014
897f368
Update README.md
clowwindy Apr 7, 2014
1564d40
proxy.pac 15%-20% faster
Mudenng May 7, 2014
fef534a
Merge pull request #8 from Mudenng/master
clowwindy May 7, 2014
f7dc319
update
clowwindy Jun 8, 2014
cd8594b
update
clowwindy Jun 8, 2014
512b8c0
another 10% faster
clowwindy Jun 9, 2014
3899494
yet another 10% faster
clowwindy Jun 9, 2014
6ec0e10
close #11
clowwindy Jun 13, 2014
1a4296e
bump
clowwindy Jun 13, 2014
15d68e8
run test again
clowwindy Jun 30, 2014
e57f832
Allow to use URL for user rule, such as a raw gist
pzgz Jul 10, 2014
5fba81f
Merge pull request #15 from pzgz/master
clowwindy Jul 14, 2014
50c2d24
fix infinite loop when the host begins with '.'
clowwindy Aug 26, 2014
e8841fc
close #17
clowwindy Oct 4, 2014
57b70e4
close #14
clowwindy Oct 4, 2014
cfe0ec7
remove print
clowwindy Oct 4, 2014
8f18dd1
bump
clowwindy Oct 4, 2014
1f08237
fix pep8
clowwindy Oct 4, 2014
80fb2eb
update pac
clowwindy Nov 19, 2014
d59b87e
add precise mode
clowwindy Nov 19, 2014
fd856e6
update pac
clowwindy Nov 19, 2014
edaed27
update rules
clowwindy Nov 19, 2014
3c34c7a
remove grammar that IE hasn't seen before
clowwindy Nov 21, 2014
9a598de
update pac
clowwindy Nov 21, 2014
64e55a0
fix IE
clowwindy Nov 21, 2014
c17ffa9
refine tests
clowwindy Nov 21, 2014
6e1c389
bump
clowwindy Nov 21, 2014
7d84adf
fix unit
clowwindy Nov 21, 2014
e32fc37
Update README.md
clowwindy Nov 21, 2014
39e3da9
Update README.md
clowwindy Nov 21, 2014
ef0af21
add more tests
clowwindy Nov 30, 2014
b343845
add coverage test
clowwindy Dec 11, 2014
707cf19
fix coverage
clowwindy Dec 11, 2014
517d60a
add html output for coverage
clowwindy Dec 28, 2014
19a56c1
add coverage badge
clowwindy Dec 28, 2014
3d3789c
update gfwlist
clowwindy Jan 5, 2015
a25138c
update pac
clowwindy Jan 5, 2015
5b10742
bump
clowwindy Jan 6, 2015
005b67b
Compatible with IE11
GangZhuo Jan 19, 2015
92a3b7b
Merge pull request #30 from GangZhuo/master
clowwindy Jan 19, 2015
f8864b5
bump
clowwindy Jan 20, 2015
2193e4b
Create CONTRIBUTING.md
clowwindy Jan 23, 2015
687c6a0
Update CONTRIBUTING.md
clowwindy Jan 23, 2015
0b0ed76
Remove 140+ duplicated domains
liruqi Jan 31, 2015
ed97afc
Sort domains for better search & diff
liruqi Jan 31, 2015
624d661
Try to fix PEP8 violations
liruqi Jan 31, 2015
0a1da2b
Try to fix PEP8 violations
liruqi Jan 31, 2015
976b29b
Try to fix PEP8 violations
liruqi Jan 31, 2015
da08cf0
Merge pull request #38 from liruqi/master
clowwindy Jan 31, 2015
91165f6
Bugfix for *.hk & *.tw domains
liruqi Feb 1, 2015
2a91a4e
Merge pull request #39 from liruqi/patch-1
clowwindy Feb 1, 2015
d3ed717
lint code
clowwindy Feb 1, 2015
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
update pac
clowwindy committed Jan 5, 2015

Verified

This commit was created on github.com and signed with GitHub’s verified signature.
commit a25138c56f8090844d5ac5dc4a521a54aa904bc0
2 changes: 1 addition & 1 deletion test/proxy.pac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Generated by gfwlist2pac
// https://github.com/clowwindy/gfwlist2pac

var proxy = "SOCKS5 127.0.0.1:1080";
var proxy = "SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1:1080; DIRECT;";

var domains = {
"4shared.com": 1,
2 changes: 1 addition & 1 deletion test/proxy_abp.pac
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Generated by gfwlist2pac in precise mode
// https://github.com/clowwindy/gfwlist2pac

var proxy = "SOCKS5 127.0.0.1:1080";
var proxy = "SOCKS5 127.0.0.1:1080; SOCKS 127.0.0.1:1080; DIRECT;";

var rules = [
"||altrec.com",