Commit Graph

761 Commits

Author SHA1 Message Date
郑树新
9f18139422 Merge pull request #24 from zhengshuxin/master
merge acl
2017-01-12 20:11:05 +08:00
zhengshuxin
cfd3cd98ee fixed bugs in fiber module. 2017-01-12 20:09:06 +08:00
zhengshuxin
627ec25f93 fixe one bug of acl_fiber_killed() in fiber.c. 2017-01-05 14:31:41 +08:00
zhengshuxin
7e13962ebf delete unused files. 2017-01-04 16:24:17 +08:00
ubuntu14
8af97f2576 delete unused sample. 2017-01-04 16:11:11 +08:00
郑树新
7d421e16d7 Merge pull request #56 from acl-dev/master
fixed bug in gson
2017-01-04 16:06:26 +08:00
fuwangqin
8a4c782281 Merge branch 'master' of https://github.com/acl-dev/acl 2017-01-04 16:03:55 +08:00
fuwangqin
abe75b495a add codes 2017-01-04 16:03:08 +08:00
fuwangqin
30c0b30bad add codes 2017-01-04 15:58:57 +08:00
郑树新
f16b62d786 Merge pull request #23 from zhengshuxin/master
merge acl
2017-01-04 14:29:22 +08:00
zhengshuxin
1c2dd4040f Merge branch 'master' of https://github.com/zhengshuxin/acl 2017-01-04 14:27:54 +08:00
zhengshuxin
ac05579106 fixed compiling error on gcc3.4.6 2017-01-04 14:25:40 +08:00
郑树新
7c9bec4658 Merge pull request #55 from acl-dev/master
Merge pull request #22 from zhengshuxin/master
2017-01-04 13:47:49 +08:00
zhengshuxin
2b7cd0a6bb gson support empty base struct object. 2017-01-04 13:39:09 +08:00
郑树新
58c4a80451 Merge pull request #22 from zhengshuxin/master
merge from acl
2017-01-03 10:53:08 +08:00
zhengshuxin
2eb4403b88 add one sample for gson object serialization. 2017-01-03 10:46:31 +08:00
zhengshuxin
c9db9bc30a delete unused files. 2017-01-03 10:28:26 +08:00
郑树新
ea85f39ad5 Merge pull request #54 from acl-dev/master
merge to acl
2017-01-03 10:21:46 +08:00
fuwangqin
733a5d3092 add codes 2017-01-03 10:19:05 +08:00
郑树新
57dad2dbba Merge pull request #21 from zhengshuxin/master
merge acl
2016-12-31 20:58:48 +08:00
zhengshuxin
03d36523e0 add acl_fiber_signal in lib_fiber. 2016-12-31 13:52:34 +08:00
郑树新
e6f67d7d0e Merge pull request #53 from acl-dev/master
merge to acl
2016-12-30 21:44:11 +08:00
fuwangqin
9a73031b22 add codes 2016-12-30 18:15:45 +08:00
fuwangqin
a5feef884b add member function supoort 2016-12-30 18:12:31 +08:00
fuwangqin
bfa1c6eb07 add Gson@skip Gson@rename 2016-12-30 17:42:46 +08:00
郑树新
f88e220555 Merge pull request #20 from zhengshuxin/master
merge from acl
2016-12-30 17:23:29 +08:00
郑树新
1e05dfb6c6 Merge pull request #52 from acl-dev/master
merge to acl
2016-12-30 17:22:20 +08:00
fuwangqin
1b81714531 add test std::map<> codes 2016-12-30 17:10:30 +08:00
fuwangqin
40b29939ae fix std::map<std::string,std::string> gen gson error 2016-12-30 17:08:18 +08:00
zhengshuxin
06fa2499fa fixed bugs in lib_fiber; add features in http module. 2016-12-29 23:58:18 +08:00
zhengshuxin
fc6ddc3970 fixed one bug in redis_pubsub::get_message which can't support psubscribe;
add one sample -- hook_close for test.
2016-12-15 13:39:26 +08:00
zhengshuxin
6d8cd37190 fixed bugs in redis module. 2016-12-14 21:15:48 +08:00
zhengshuxin
19f2c0b0d2 fiber lock can be killed. 2016-12-08 13:13:30 +08:00
zhengshuxin
1b6d166ef6 add acl_fiber_kill for fiber lib;
add listen callback for master template.
2016-12-03 20:09:21 +08:00
ubuntu14
bcb2f1b85c fixed one bug in fiber.c for memory leak
add some samples for lib_liber
2016-11-27 21:03:24 +08:00
zhengshuxin
2c3b988fcf hook bind/listen in lib_fiber 2016-11-18 22:24:41 +08:00
zhengshuxin
2b282d9f66 remove setting non-blocking in acl_vstream_fdopen. 2016-11-18 21:45:40 +08:00
zhengshuxin
4aef130a1f fixed one bug in redis_command::run, connection should be put back when n >= redirect_max_. 2016-11-08 20:55:26 +08:00
zhengshuxin
4bc27a685f remove pread64/pwrite64. 2016-11-08 10:09:06 +08:00
zhengshuxin
1077d2b142 fixed on bug in redis_result::argv_to_string() 2016-11-07 22:14:23 +08:00
zhengshuxin
53dd737565 delete unused master_threads2 class 2016-11-04 22:26:38 +08:00
zhengshuxin
70c467f1e8 delete unused master_threads2 class. 2016-11-04 22:05:28 +08:00
zhengshuxin
3bf64fa72d fixed bugs in db pool for setting charset. 2016-11-03 11:19:11 +08:00
zhengshuxin
d23684265b acl.3.2.2.1 released, fixed one urgent bug in db_mysql.cpp 2016-11-02 11:16:43 +08:00
zhengshuxin
0d88117427 fxied urgent bug in class db_mysql for init charset_ 2016-11-02 10:38:07 +08:00
郑树新
b3c2f911b7 Merge pull request #19 from zhengshuxin/master
merge from acl
2016-11-01 21:55:54 +08:00
郑树新
ac7a5d5db0 Merge pull request #50 from acl-dev/master
Merge pull request #18 from zhengshuxin/master
2016-11-01 21:52:01 +08:00
zhengshuxin
6265718c20 acl 3.2.2 released! 2016-11-01 20:53:39 +08:00
zhengshuxin
758319beb3 fixed bugs in redis_string::incrbyfloat and redis_hash::hincrbyfloat 2016-10-31 21:41:36 +08:00
zhengshuxin
b91d15cfed add LONGJMP/SETJMP in asm language. 2016-10-31 14:04:43 +08:00