郑树新
|
32b7a41180
|
Merge branch 'master' into 'master'
add acl-master independence spec
See merge request !8
|
2020-06-08 10:06:11 +08:00 |
|
wanghaibin
|
624fc715be
|
Merge branch 'upstream_master'
|
2020-06-08 10:04:10 +08:00 |
|
wanghaibin
|
3733c42c08
|
Conflicts:
Makefile
packaging/acl-master.spec
|
2020-06-08 09:57:35 +08:00 |
|
shuxin zheng
|
4d46e64edf
|
Merge branch 'gitlab-upstream-master'
|
2020-06-07 21:50:36 +08:00 |
|
shuxin zheng
|
175d852ea5
|
add more options for zadd in redis_zset
|
2020-06-07 21:47:59 +08:00 |
|
wanghaibin
|
39d6abaf74
|
Squashed commit of the following:
commit 98dfe6d58a00a825465ada1255098c1f4149f703
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 23:21:04 2020 +0800
modify acl-libs
commit 04d9b89f8b7427825eb45e0dc3b25a5274a627f3
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 23:13:46 2020 +0800
modify makefile
commit d292ad9c3f6b6ad170e480950ff87c1954d03de8
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 23:08:10 2020 +0800
modify makefile
commit 6f8d0739e9408e140720f127dbf3eab421082287
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 22:59:15 2020 +0800
modify master spec
commit 3da0067873a28a35588ff550a77f6227297530cc
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 22:47:09 2020 +0800
add master spec
|
2020-06-05 23:25:57 +08:00 |
|
郑树新
|
b6504b62bb
|
Merge branch 'master' into 'master'
modify yml
See merge request !7
|
2020-06-05 18:35:38 +08:00 |
|
wanghaibin
|
93c3259f6d
|
modify yml
|
2020-06-05 18:34:33 +08:00 |
|
zhengshuxin
|
69d8baf06c
|
release 3.5.1-4 for the new rpm package
|
2020-06-05 18:15:34 +08:00 |
|
郑树新
|
86daddc2d6
|
Merge branch 'master' into 'master'
modify spec for 6.x
See merge request !6
|
2020-06-05 17:45:23 +08:00 |
|
wanghaibin
|
c2222d8d0c
|
modify spec
|
2020-06-05 17:40:51 +08:00 |
|
郑树新
|
08f04bec94
|
Merge branch 'master' into 'master'
modify acl-master rpm info add master_ctl and remove acl-tools
See merge request !5
|
2020-06-05 17:14:03 +08:00 |
|
wanghaibin
|
b42481dec0
|
Squashed commit of the following:
commit db13e6eacff1819b49e966e52099b61c0856e07b
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 17:03:11 2020 +0800
modify spec
commit 45f79bc576298d0683e400078d52c1be3e452969
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 16:55:00 2020 +0800
modify spec
commit 328c363acb9ba691b12afdd9e1a4bcd96319d92b
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 16:53:09 2020 +0800
modify spec
commit 3a6d6fdb48dbb575b2bf62e8acc2b78ef552c818
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 16:48:52 2020 +0800
modify makefile
commit 779896221149e72929413c6c4e1ba34f1bf14ec5
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 16:45:01 2020 +0800
modify Makefile
commit 0efba25a93acde43af531e1928568826b3b3e855
Author: wanghaibin <wanghaibin@qiyi.com>
Date: Fri Jun 5 16:38:27 2020 +0800
modify spec
|
2020-06-05 17:11:51 +08:00 |
|
shuxin zheng
|
c4ae1840d7
|
modify CMakeLists files
|
2020-06-02 16:51:35 +08:00 |
|
shuxin zheng
|
e0d35f97b1
|
fixed one bugs in redis_hash.cpp demo
|
2020-06-02 12:40:00 +08:00 |
|
shuxin zheng
|
37ae5c4ba7
|
don't use POLLPRI when calling poll API on Windows.
|
2020-06-02 09:15:58 +08:00 |
|
zhengshuxin
|
d249613224
|
release 3.5.1-3 for supporting "application/x-gzip" from http response header in http_client.cpp
|
2020-06-01 16:22:19 +08:00 |
|
zhengshuxin
|
e355d83ab5
|
support "application/x-gzip" response header in http_client.cpp.
|
2020-06-01 16:18:47 +08:00 |
|
shuxin zheng
|
233fca5f69
|
add some design drawing for fiber ppt
|
2020-06-01 15:32:55 +08:00 |
|
markmeson
|
9d4f9350e8
|
Add WSAPoll for pre-Vista Windows
|
2020-05-31 18:30:57 -04:00 |
|
zhengshuxin
|
914bfb6aea
|
optimize iocp events
|
2020-05-29 11:23:23 +08:00 |
|
zhengshuxin
|
4b6add9edd
|
remove debug log info
|
2020-05-29 10:35:34 +08:00 |
|
shuxin zheng
|
9a53f3aa08
|
relase 3.5.1-2 tag
|
2020-05-28 16:21:02 +08:00 |
|
zhengshuxin
|
b5173f228f
|
add HVALS command in redis_hash
|
2020-05-22 13:37:49 +08:00 |
|
shuxin zheng
|
086cf85140
|
make string operator= more safety
|
2020-05-20 11:05:37 +08:00 |
|
shuxin zheng
|
ba26b15032
|
export bmp_ in bitmap
|
2020-05-19 18:20:48 +08:00 |
|
shuxin zheng
|
53d97b221c
|
add some methos in redis_key class
|
2020-05-19 12:47:50 +08:00 |
|
shuxin zheng
|
15e48b11b6
|
expand the bitmap's function
|
2020-05-19 12:03:24 +08:00 |
|
shuxin zheng
|
79317f0965
|
change compiling flag "-Wno-extended-offsetof" to "-Wno-invalid-offsetof" for clang
|
2020-05-19 09:28:57 +08:00 |
|
zhengshuxin
|
8fb50aa0e6
|
build ok with different gcc version
|
2020-05-13 15:42:50 +08:00 |
|
zhengshuxin
|
464878b948
|
Merge branch 'master' of github:zhengshuxin/acl into github-zsx-master
|
2020-05-13 00:03:54 +08:00 |
|
zhengshuxin
|
81ad67eb78
|
build lib_acl by cmake ok
|
2020-05-13 00:01:46 +08:00 |
|
zhengshuxin
|
a0897815e0
|
merge dns module
|
2020-05-11 11:29:47 +08:00 |
|
郑树新
|
a02c55173a
|
disable compiling dns module in libfiber for windows.
|
2020-05-10 20:25:04 +08:00 |
|
shuxin zheng
|
8130e91886
|
format code style
|
2020-05-09 23:31:44 +08:00 |
|
郑树新
|
1e8c168147
|
!5 SET key value [EX seconds] [PX milliseconds] [NX|XX]
Merge pull request !5 from wfeii1980/master
|
2020-05-09 23:19:21 +08:00 |
|
wii
|
344f06e4fb
|
-bugs flag比对错误
|
2020-05-09 16:56:50 +08:00 |
|
wii
|
2868c572ed
|
Redis String cmd:"SET key value [EX seconds] [PX milliseconds] [NX|XX]"支持
|
2020-05-09 16:22:51 +08:00 |
|
zhengshuxin
|
81b2131885
|
test websocket
|
2020-05-08 22:35:13 +08:00 |
|
shuxin zheng
|
e99003e472
|
keep compiling symbols for ndk16
|
2020-05-08 15:18:55 +08:00 |
|
shuxin zheng
|
3250875984
|
test websocket demo for Android
|
2020-05-08 14:43:30 +08:00 |
|
shuxin zheng
|
2bd1024971
|
add websocket demo for android
|
2020-05-07 19:02:18 +08:00 |
|
shuxin zheng
|
3d7737628f
|
fixed compiling warning by xcode
|
2020-05-07 10:55:14 +08:00 |
|
shuxin zheng
|
2507cab804
|
test redis ssl ok
|
2020-05-05 23:25:02 +08:00 |
|
shuxin zheng
|
d5e0e7d965
|
fixed bug in mbedtls_conf module and test redis with ssl ok.
|
2020-05-05 23:16:32 +08:00 |
|
shuxin zheng
|
4e2ddf3aa1
|
test demo of fiber for resolving dns
|
2020-05-05 00:29:38 +08:00 |
|
zhengshuxin
|
da299c6ae6
|
fixed compiling warning for dns.c in libfiber.c
|
2020-05-05 00:20:51 +08:00 |
|
zhengshuxin
|
56d1c7e443
|
fixed dns module bug of libfiber for gcc9
|
2020-05-04 23:16:52 +08:00 |
|
zhengshuxin
|
1f53d1370c
|
build for different linux platform
|
2020-05-04 21:05:40 +08:00 |
|
zhengshuxin
|
c1f70983b4
|
Merge branch 'master' of github:acl-dev/acl
|
2020-05-04 20:33:18 +08:00 |
|