Commit Graph

5140 Commits (8599697f5a9d13e6fb28a2a1ba5899915eaf3f57)

Author SHA1 Message Date
vcptr 905ac82bb1 more test to common/buf 2019-11-22 17:40:24 +08:00
Kslr ec9cf059e8
Merge pull request #2041 from mellow-io/fix-reader
properly propagate Reader errors
2019-11-22 17:22:47 +08:00
ghost 8da0a53845 properly propagate Reader errors 2019-11-22 10:11:23 +08:00
Kslr e52d3fa90b
Merge pull request #2037 from weaving118/master
add ip match feature for dns
2019-11-21 22:15:26 +08:00
vcptr 621cb8fc80 Merge branch 'raymaster' into flymaster 2019-11-21 14:37:20 +08:00
weaving118 debb7f0c44
ignore if domain already lookup failed 2019-11-21 02:32:09 +08:00
weaving118 1345185b81
add errExpectedIPNonMatch and return nil if empty response 2019-11-21 01:09:23 +08:00
Kslr 44aafae19e
Merge pull request #2039 from v2fly/fixconftest
fix test failed on logger position
2019-11-20 22:01:38 +08:00
weaving118 e916a3b29d
update confip ip to expectIPs 2019-11-20 17:20:33 +08:00
vcptr 47a5c970fc fix test failed on logger position 2019-11-20 15:08:20 +08:00
vcptr 699e73c760 Merge branch 'raymaster' into flymaster 2019-11-20 11:24:43 +08:00
Kslr c94f5f66a6
Merge pull request #2038 from vcptr/earlylog
Earlylogger
2019-11-19 18:26:17 +08:00
vcptr 54f903040a early inited log 2019-11-19 14:06:25 +08:00
vcptr 901e4837ad logger module start firstly 2019-11-19 14:06:20 +08:00
vcptr 3c3a828e3b Merge branch 'raymaster' into flymaster 2019-11-19 14:00:46 +08:00
vcptr 8854c7872f early inited log 2019-11-19 09:49:33 +08:00
weaving118 101f5d32fa
add ip match feature for dns 2019-11-18 23:48:42 +08:00
Kslr 7f40be7567
Merge pull request #2002 from forever8938/master
Support external domain file for dns hosts
2019-11-12 01:55:28 +08:00
vcptr 8cfb682f9c Merge branch 'raymaster' into flymaster 2019-11-06 12:47:44 +08:00
Kslr 9a06ff8f91
Merge pull request #2005 from mellow-io/fix-read
fix ReadBuffer()
2019-11-05 18:35:58 +08:00
ghost f7abe353df fix ReadBuffer() 2019-11-03 17:37:44 +08:00
forever8938 6bfe044cfa
Support external domain file for dns hosts 2019-11-02 15:49:29 +08:00
vcptr 63b7eeacd1 docker file compatible with ray version 2019-11-02 13:38:29 +08:00
vcptr b9480cb4b4 arm release include GOARM=6 2019-10-31 19:24:37 +08:00
vcptr 0d60a9e719 logger module start firstly 2019-10-31 19:13:19 +08:00
vcptr 0eb590ce7a docker pkg with name docker-fly 2019-10-31 17:30:10 +08:00
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