Commit Graph

585 Commits

Author SHA1 Message Date
郑树新
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
郑树新
b645636cc0 Update README.md 2016-10-30 22:07:18 +08:00
zhengshuxin
c98290445b add fiber test examples. 2016-10-30 21:24:51 +08:00
zhengshuxin
dd0bcc2c07 pread64/pwrite64 can be used by gcc3.x.x 2016-10-28 15:22:34 +08:00
zhengshuxin
60f2fc2203 fixed compiling error on centos4.7 by gcc3.x.x 2016-10-28 15:01:42 +08:00
zhengshuxin
ee968f72ae rename acl_init to acl_lib_init. 2016-10-27 21:25:14 +08:00
zhengshuxin
c41bb925db delete useless code in db_pool::peek_open. 2016-10-25 11:26:06 +08:00
zhengshuxin
495f4c55c0 rename acl_init to acl_lib_init and acl_end to acl_lib_end. 2016-10-25 10:45:37 +08:00
zhengshuxin
be034725b3 rename acl_init to acl_lib_init; fixed one bug in url encoding for '+' 2016-10-25 10:31:33 +08:00
zhengshuxin
f69eb3dedb fixed one bug for charset setting in db_pool 2016-10-24 11:44:12 +08:00
zhengshuxin
309aa8f2f2 modify vc2015 project. 2016-10-23 19:45:25 +08:00
郑树新
9aea6d3b9b Merge pull request #18 from zhengshuxin/master
merge from acl
2016-10-23 19:11:32 +08:00
郑树新
5400eb52f4 Merge pull request #49 from acl-dev/master
Merge pull request #17 from zhengshuxin/master
2016-10-23 19:10:33 +08:00
zhengshuxin
be07157761 fixed one bug in acl_json.h for duplicate defined ACL_JSON_T_XXX 2016-10-21 17:22:40 +08:00
zhengshuxin
f30b2b4144 add some websocket samples(upload_server/upload_client); fixed some bugs in acl; 2016-10-21 15:02:50 +08:00
zhengshuxin
17af199b70 Merge branch 'master' of https://github.com/zhengshuxin/acl 2016-10-20 09:09:34 +08:00
zhengshuxin
4b7499d955 mv websocket into websocket path 2016-10-20 09:08:27 +08:00
郑树新
68cd76df36 Merge pull request #17 from zhengshuxin/master
merge from acl
2016-10-19 15:32:17 +08:00
郑树新
52401d21fe Merge pull request #48 from acl-dev/master
Merge pull request #16 from zhengshuxin/master
2016-10-19 15:30:49 +08:00
zhengshuxin
7022d29557 fixed one bug in fiber_io.c for init __thread_fiber->loop_fn. 2016-10-19 15:06:09 +08:00
郑树新
da2e4bad1b Merge pull request #16 from zhengshuxin/master
Merge from acl
2016-10-17 23:02:35 +08:00
郑树新
3d10946d67 Merge pull request #47 from acl-dev/master
merge to acl
2016-10-17 23:01:54 +08:00
akzi
da4feafa1e add vector map field 2016-10-17 16:44:12 +02:00
akzi
ff6f3d162b Merge branch 'master' of https://github.com/acl-dev/acl 2016-10-17 22:33:57 +08:00
akzi
9dec28ece4 add pointor = null,if no value exist 2016-10-17 22:32:23 +08:00
郑树新
acff5e9771 Merge pull request #46 from acl-dev/master
merge to acl
2016-10-17 22:25:47 +08:00
zhengshuxin
b52ba569ec add one gson sample: test4 2016-10-17 22:23:21 +08:00