Commit Graph

820 Commits

Author SHA1 Message Date
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
akzi
576a1f6e44 add codes for add_item processing std::string acl::string char * 2016-10-17 16:02:31 +02:00
郑树新
463491d21a Merge pull request #45 from acl-dev/master
merge to acl
2016-10-17 17:06:46 +08:00
zhengshuxin
ec57cdb0b0 add one gson sample: test3 2016-10-17 16:59:27 +08:00
zhengshuxin
497123af7d add one test sample. 2016-10-16 20:22:26 +08:00
郑树新
5d2d733196 Merge pull request #15 from zhengshuxin/master
Merge from acl
2016-10-15 00:10:03 +08:00
zhengshuxin
4e25961a56 add gson into vc2003, 2008, 2010, 2012 2016-10-15 00:07:33 +08:00
郑树新
c6bbd0d002 Merge pull request #44 from acl-dev/master
merge to acl
2016-10-14 22:50:28 +08:00
zhengshuxin
568a5402e6 let gson look like a good C+= style. 2016-10-14 22:48:32 +08:00
郑树新
bd23b7e9b9 Merge pull request #14 from zhengshuxin/master
Merge pull request #43 from acl-dev/master
2016-10-14 17:23:52 +08:00
郑树新
97781a8233 Merge pull request #43 from acl-dev/master
merge from acl
2016-10-14 17:22:46 +08:00
zhengshuxin
eb17148b30 Merge branch 'master' of https://github.com/acl-dev/acl 2016-10-14 17:21:23 +08:00
zhengshuxin
a8b08d7e16 the gson.cpp/gson.h files should be appened "\n" in the end of which. 2016-10-14 17:20:20 +08:00
郑树新
c812ec59fb Merge pull request #13 from zhengshuxin/master
merge from acl
2016-10-14 15:44:31 +08:00
郑树新
36bce80cea Merge pull request #42 from acl-dev/master
merge from acl
2016-10-14 15:43:23 +08:00
dep
b0090e4ce1 C++ serialization module gson can support non C++11. 2016-10-14 15:11:13 +08:00