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

Socks4 support, pls #356

Open
wants to merge 153 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
153 commits
Select commit Hold shift + click to select a range
87baf3f
Update README.md
j67678 Oct 5, 2014
9815078
Delete README-en.md
j67678 Oct 5, 2014
f0bb8d0
Update README.md
j67678 Oct 5, 2014
0a1627e
Update README.md
j67678 Oct 5, 2014
df4b426
rename cow to meow
Oct 5, 2014
dbdd3f1
ignore stat.txt.bak
Oct 5, 2014
a127f8a
fix readme
Oct 5, 2014
7442a53
add direct site
Oct 6, 2014
5eaa82b
now is MEOW
Oct 12, 2014
0f0bde1
now with README
Oct 12, 2014
f24a9d9
readme
Oct 12, 2014
85f8c77
fix pac & log
Oct 12, 2014
aa3e895
add my site
Oct 12, 2014
66bddd9
remove amazonaws.com
Oct 12, 2014
7de5feb
readme
Oct 12, 2014
77b8603
fix client connect method
Oct 12, 2014
bb82e89
add kardianos/service
Oct 12, 2014
6406b68
remove service: failed to implement
Oct 12, 2014
3f5959e
no retry
Oct 12, 2014
96d639b
with icon & now beta
Oct 12, 2014
fd72d41
update direct list
Oct 12, 2014
ade5681
readme
Oct 13, 2014
223b92b
rename install-meow.sh
Oct 13, 2014
38a59d9
remove unused methods
Oct 13, 2014
fd3f626
fix tests & png icon
Oct 14, 2014
18d9b88
fix test
Oct 14, 2014
6dc55b4
update CHANGELOG
Oct 14, 2014
64cb738
readme
Oct 14, 2014
4bba66f
remove useless functions
Oct 14, 2014
a1b265e
fix test
Oct 14, 2014
9a313da
fix test.sh
Oct 14, 2014
a1c382c
optimize output
Oct 14, 2014
0d7d463
change test.sh
Oct 14, 2014
3ff039b
update README
Oct 14, 2014
94d0bbb
minor change
Oct 14, 2014
d3d7f0a
remove co.uk in direct list
Oct 17, 2014
080a00b
remove timeout
Oct 18, 2014
6a487f1
only `ipShouldDirect` to implement
Oct 18, 2014
ceb235e
remove useless functions in pac.go
Oct 18, 2014
dbc8e38
readme
Oct 18, 2014
2ddeb36
readme
Oct 18, 2014
8ab772f
update scripts & finish build.sh
Oct 18, 2014
ab60c50
finish install.sh
Oct 18, 2014
1f6eb66
linux & os x release
Oct 18, 2014
3eb6faf
rename win builds
Oct 18, 2014
9e4fb0c
readme
Oct 19, 2014
259aa25
update build script
Oct 19, 2014
4e339fa
readme
Oct 19, 2014
3d20415
remove .jp domains in direct list
Oct 19, 2014
8d5adf2
validate direct sites
Oct 21, 2014
ea4fe97
Update install.sh
j67678 Oct 22, 2014
4bd7be3
remove detectSSL
Feb 24, 2015
a3717d2
correctly close client conn
Feb 25, 2015
22e82c2
version 1.1
Feb 25, 2015
1380a01
remove config entry for detectSSL
Feb 25, 2015
319e6e8
new taskbar wrapper
Mar 11, 2015
94c926e
add locks to directlist
Apr 30, 2015
c46ad58
1.2
Apr 30, 2015
38018d7
check private ip for unknown host
Apr 30, 2015
23e540c
recover from panic when judging ip
May 3, 2015
1e11b11
if trying to get http://0.0.0.0/
May 3, 2015
689402e
update error message
May 3, 2015
8b4ca6e
print lookup host ip error
May 5, 2015
d8a4984
Fix #292: return direct for *.local host in PAC.
cyfdecyf Apr 12, 2015
cdec2e6
fix typo
May 9, 2015
4d9d320
changelog
May 13, 2015
193a758
Fix #302: use crc32 to hash hostname
cyfdecyf May 11, 2015
7e4ca1e
Use Go 1.4.2 on travis.
cyfdecyf May 12, 2015
7166541
Add new encryption in sample rc.
cyfdecyf May 12, 2015
d2bd315
changelog
May 13, 2015
6bd0508
specify at least one parent proxy
Jul 15, 2015
1c16a88
load domain list using proxy
Jul 15, 2015
5628685
1.3
Jul 15, 2015
6a0c490
Update README.md
Jul 15, 2015
f331344
add support for change stat file position in config
fzerorubigd May 31, 2015
8714e57
Implement #328, allow specifying stat/blocked etc. in config file.
cyfdecyf Jun 2, 2015
68d3af9
Setup all logger before calling initLog().
cyfdecyf Jun 2, 2015
50278fd
Remove unused function copyNWithBuf.
cyfdecyf Jun 2, 2015
346a9d0
Find default rc file in parseCmdLineConifg.
cyfdecyf Jun 2, 2015
aec1185
Fix typo.
cyfdecyf Jun 3, 2015
237b8a9
fixes & CHANGELOG
Jul 15, 2015
cb857b5
add google hk and jp in proxy domain list
Jul 15, 2015
1dd106c
Update README.md
Jul 15, 2015
54b6717
update direct & proxy list
Jul 16, 2015
6e1f031
Update README.md
Jul 16, 2015
f0d75d8
clean .cn sites
Jul 16, 2015
79ca937
Update README.md
Jul 16, 2015
2cbabe3
Update README.md
Jul 16, 2015
3746459
Update net.ohrz.meow.plist
Jul 17, 2015
254a6ee
README: compile using Go 1.5
Aug 20, 2015
312dbba
remove tunnel allowed port function
Aug 23, 2015
b9aaa3b
use go 1.5 for travis
Aug 23, 2015
4667452
1.3.1
Aug 23, 2015
05695c1
Update README.md
Aug 23, 2015
f9a69f1
Update README.md
Aug 23, 2015
6a210fa
Update README.md
Aug 23, 2015
a5b49b6
no meowproxy.me
Oct 9, 2015
e54ef5d
1.3.2
Oct 9, 2015
97d2492
download link
Oct 11, 2015
117604e
Update install.sh
j67678 Nov 4, 2015
295bf47
add reject list
wjchen Oct 27, 2015
af19d0d
add more sites
j67678 Nov 20, 2015
62a1417
remove estimateTimeout
j67678 Nov 20, 2015
56af310
add local https proxy support
j67678 Nov 20, 2015
7eed10b
add support for remote https proxy
j67678 Nov 20, 2015
20d7bf9
fix reject when no parent server
j67678 Nov 20, 2015
5ceb7d8
fix pac
j67678 Nov 20, 2015
b732527
refact code and fix tests
j67678 Nov 20, 2015
5825bea
Performance improvement for cn ip search.
j67678 Nov 20, 2015
60a7087
use 1.5.1 for travis ci
j67678 Nov 20, 2015
91b7a96
fix listen meow
j67678 Nov 20, 2015
4124893
exit on error for build.sh
Nov 22, 2015
06d8f69
1.3.3
Nov 22, 2015
85fdd72
add reject file
Nov 22, 2015
dcd23b5
update docs
Nov 22, 2015
1eed558
update README
Nov 22, 2015
019e689
Update README.md
iyee Nov 22, 2015
4ec1f48
Merge pull request #28 from iyee/patch-1
j67678 Nov 23, 2015
535a8a8
Add Linux style service script :/etc/init.d/meow
soimy Nov 23, 2015
4edca0e
Merge pull request #30 from soimy/master
j67678 Nov 30, 2015
e49ac32
Update meow
j67678 Nov 30, 2015
b307652
fix isErrConnReset & isErrTooManyOpenFd
j67678 Dec 3, 2015
7a469f3
fix client connection manage bug (again) (shame)
j67678 Dec 3, 2015
e879993
1.3.4
Dec 3, 2015
5a08dd3
fix variable scope
Dec 3, 2015
c1aaaf3
Update README.md
j67678 Dec 3, 2015
3aa2d8a
Update README.md
j67678 Dec 3, 2015
a1ac489
Update README.md
j67678 Dec 3, 2015
05ddd24
Update README.md
j67678 Feb 18, 2016
55e0875
1.3.5
j67678 Jun 13, 2016
a4e59ee
update script
j67678 Jun 13, 2016
7ede13c
add script
j67678 Jun 13, 2016
dc168cb
update README
j67678 Jun 13, 2016
3d41875
modify config.go
messyidea Jul 21, 2016
6da3449
Merge pull request #64 from messyidea/master
j67678 Jul 22, 2016
e6c2c6c
add git user info
j67678 Jul 22, 2016
f03c2c7
syscall.WSAECONNRESET
j67678 Aug 25, 2016
f11de91
update travis ci
j67678 Aug 25, 2016
222a462
fix
j67678 Aug 25, 2016
a585ba7
go version
j67678 Aug 25, 2016
a480417
upate chinaip; chinaip gen script
j67678 Sep 29, 2016
c14122b
1.5
j67678 Sep 29, 2016
b8d58c0
add CHANGLOG.md
j67678 Sep 29, 2016
a1c1c20
fix build script
j67678 Sep 29, 2016
7c24109
Update rc-full
j67678 Nov 15, 2016
8a4b489
Update rc
j67678 Nov 15, 2016
5141ad3
Update rc
j67678 Nov 15, 2016
23c6afc
Update direct
j67678 Feb 25, 2017
aebeb9b
Update README.md
j67678 Feb 28, 2017
00310d1
Update README.md
j67678 Feb 28, 2017
5d5e363
Update README.md
j67678 Feb 28, 2017
0d70a72
Update README.md
j67678 Mar 17, 2017
cc6df42
Update README.md
j67678 Mar 18, 2017
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
8 changes: 7 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,8 @@
bin/
*.sublime*
cow-proxy
meow-proxy
MEOW
MEOW.exe
direct.txt
rc.txt
rc-full.txt
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: go
go:
- 1.3
- 1.7
env:
- TRAVIS="yes"
install:
Expand Down
144 changes: 0 additions & 144 deletions CHANGELOG

This file was deleted.

33 changes: 33 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
## 更新说明
- 2016-09-29 Version 1.5

* 更新中国IP列表

- 2016-02-18 Version 1.3.4

* 使用 Go 1.6 编译,请重新下载

- 2015-12-03 Version 1.3.4

* 修正客户端连接未正确关闭 bug
* 修正对文件描述符过多错误的判断(too many open files)

- 2015-11-22 Version 1.3.3

* 增加 `reject` 拒绝连接列表
* 支持作为 HTTPS 代理服务器监听
* 支持 HTTPS 代理服务器作为父代理


- 2015-10-09 Version 1.3.2

* 完全托管在 github,不再使用 meowproxy.me 域名,[新的下载地址](https://github.com/renzhn/MEOW/tree/gh-pages/dist/)

- 2015-08-23 Version 1.3.1

* 去除了端口限制
* 使用最新的 Go 1.5 编译

- 2015-07-16 Version 1.3

更新了默认的直连列表、加入了强制使用代理列表,强烈推荐旧版本用户更新 [direct](https://raw.githubusercontent.com/renzhn/MEOW/master/doc/sample-config/direct) 文件和下载 [proxy](https://raw.githubusercontent.com/renzhn/MEOW/master/doc/sample-config/proxy) 文件(或者重新安装)
22 changes: 22 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
FROM debian:wheezy

RUN apt-get update -y && apt-get install --no-install-recommends -y -q \
curl \
zip \
build-essential \
ca-certificates \
git mercurial bzr \
&& rm -rf /var/lib/apt/lists/*

ENV GOVERSION 1.6.2
RUN mkdir /goroot && mkdir /gopath
RUN curl https://storage.googleapis.com/golang/go${GOVERSION}.linux-amd64.tar.gz \
| tar xvzf - -C /goroot --strip-components=1

ENV GOPATH /gopath
ENV GOROOT /goroot
ENV PATH $GOROOT/bin:$GOPATH/bin:$PATH

RUN go get github.com/mitchellh/gox

CMD go get -d ./... && gox
96 changes: 0 additions & 96 deletions README-en.md

This file was deleted.

Loading