lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2024-11-17 18:06:15 -05:00
Code Issues Releases Wiki Activity
4,614 Commits 21 Branches 437 Tags 71 MiB
4448d37c2b
Commit Graph

4614 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
vcptr
3c8c9adcf7 Merge branch 'dockerdev' into flymaster 2019-10-31 12:38:01 +08:00
vcptr
bec564b455 adjust args 2019-10-31 11:44:57 +08:00
vcptr
4da588d406 add abpath to user-package 2019-10-31 11:29:18 +08:00
Shelikhoo
275e2d5af7
Fix build error, blaim golang.org/x/crypto@v0.0.0-20190308221718-c2843e01d9a2 2019-10-30 21:36:12 +08:00
Shelikhoo
95f808ccd8
Fix merge error 2019-10-30 20:24:38 +08:00
Shelikhoo
aecf18af0c
Fix merge error 2019-10-30 20:15:31 +08:00
Shelikhoo
35e9da8ca6
Merge branch 'master' of github.com:v2ray/v2ray-core 
This are significant amount of change introduced in this merge, needs 
additional testing.
 2019-10-30 20:03:11 +08:00
Shelikhoo
b258ca7290
Set core version 2019-10-30 18:46:33 +08:00
Shelikhoo
d1881e2bc6
Output Release ID 2019-10-30 17:04:17 +08:00
Shelikhoo
0e39a08e10
Fix X file mode 2019-10-30 15:53:04 +08:00
Shelikhoo
a43cd8acf5
Auto Release for Tag build 2019-10-30 15:03:29 +08:00
Shelikhoo
7a9f446272
Added Tag into build trigger 2019-10-30 12:32:35 +08:00
kslr
5e1d8f8e69 release 4.21.3 2019-10-28 23:12:46 +08:00
Kslr
e55f1c5722
Merge pull request #1981 from v2ray/revert-1893-patch-1 
Revert "Fix self-signed certificates on Windows"
 2019-10-28 23:00:29 +08:00
Kslr
ae04c402da
Revert "Fix self-signed certificates on Windows" 2019-10-28 23:00:09 +08:00
Kslr
8a36846869
Merge pull request #1975 from fcying/access_log_add_detour_tag 
check detour tag size
 2019-10-27 23:29:36 +08:00
fcying
1cc7702c51 check detour tag size 2019-10-27 23:14:08 +08:00
Kslr
876e2fcc73
Merge pull request #1904 from hex2tan/master 
fixed add new vmess user bug
 2019-10-27 15:27:03 +08:00
Kslr
5bb4efd126
Merge pull request #1893 from lixin9311/patch-1 
Fix self-signed certificates on Windows
 2019-10-27 15:23:39 +08:00
kslr
bf6cf0bc75 release 4.21.2 2019-10-27 15:00:59 +08:00
Kslr
e34266b784
Merge pull request #1973 from fcying/access_log_add_detour_tag 
access log add detour tag
 2019-10-27 14:57:01 +08:00
fcying
fa926a1d1d access log add detour tag 2019-10-27 14:24:50 +08:00
kslr
85d2c69241 release 4.21.1 2019-10-26 18:54:37 +08:00
Kslr
1ebaca3bf3
Merge pull request #1966 from v2fly/tlsohttp 
fix: allow tls outbound http proxy outbound
 2019-10-25 18:03:12 +08:00
vcptr
385fed08de fix: allow tls outbound http proxy outbound 2019-10-25 18:00:01 +08:00
kslr
5e14afd293 release 4.21.0 2019-10-24 22:46:10 +08:00
Kslr
d0ac3e9d8e
Merge pull request #1940 from enihcam/master 
Add SO_REUSEPORT (kernel level load balance) support
 2019-10-19 12:19:09 +08:00
Kslr
98fd5eafbf
Merge pull request #1955 from v2fly/nonext 
migrate to go mod to maintain 3rd party libs
 2019-10-19 12:18:09 +08:00
vcptr
854f97fb78 remove script's fiddling 2019-10-19 11:12:11 +08:00
vcptr
c022ce610e add doc under external 2019-10-19 10:38:27 +08:00
vcptr
fa0a21f0dd external module refraction-networking/utls use mod version 2019-10-19 10:22:49 +08:00
vcptr
5d9e2e69a9 external module gorilla/websocket use mod version 2019-10-19 10:05:40 +08:00
Kslr
31a647bcf0
Merge pull request #1950 from keepalivesrc/patch-2 
Websocket Read Limit Fix
 2019-10-18 17:54:04 +08:00
keepalivesrc
01c7bba529
Delete conn_test.go 2019-10-16 16:58:07 -07:00
keepalivesrc
3b2d63d8d3
update TestReadLimit sub-test 2019-10-16 16:52:41 -07:00
Nicholas Wang
37d051f5e5
Merge pull request #6 from nicholascw/master 
new group link in release/doc/readme.md
 2019-10-16 16:18:52 -05:00
Nicholas Wang
1e49ba3b0f
new group link 2019-10-16 16:18:09 -05:00
Nicholas Wang
607425b9bb
Merge pull request #1951 from nicholascw/master 
new telegram group link in release/doc/readme.md
 2019-10-16 16:15:54 -05:00
Nicholas Wang
bc828b2986
new telegram group link 2019-10-16 16:14:23 -05:00
Kslr
0d213ff077
Merge pull request #1949 from keepalivesrc/patch-1 
fix typos
 2019-10-17 03:19:57 +08:00
keepalivesrc
96dc2c1c81
websocket Read Limit Fix 
This fix addresses a potential denial-of-service (DoS) vector that can cause an integer overflow in the presence of malicious WebSocket frames.

The fix adds additional checks against the remaining bytes on a connection, as well as a test to prevent regression.

Credit to Max Justicz (https://justi.cz/) for discovering and reporting this, as well as providing a robust PoC and review.

* bugfix: fix DoS vector caused by readLimit bypass
* bugfix: payload length 127 should read bytes as uint64
* bugfix: defend against readLength overflows
 2019-10-16 01:14:01 -07:00
keepalivesrc
ac481e6842
fix typos 2019-10-16 01:04:35 -07:00
nullptr
ed1ade4266 Add SO_REUSEPORT (kernel level load balance) support 2019-10-13 12:12:49 +08:00
Kslr
dc6a253056
Merge pull request #1936 from v2fly/go113 
Go113
 2019-10-10 18:41:21 +08:00
vcptr
51f41743f9 mod tidy 2019-10-10 15:24:23 +08:00
vcptr
6233a1e6d9 ci script use -insecure flag too 2019-10-10 15:14:50 +08:00
vcptr
45afb53614 update mods 2019-10-10 15:05:27 +08:00
vcptr
8759e28890 update for go1.13+ 2019-10-10 14:56:01 +08:00
Kslr
501b704719
Merge pull request #1933 from felixonmars/patch-2 
Correct a typo in port.go
 2019-10-09 08:10:10 +08:00
Felix Yan
b94e3ced7a
Correct a typo in port.go 2019-10-09 06:06:47 +08:00