1159 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
zhengshuxin	892e102435	EVENT: tring to check fd's type by add call ev->add	2017-09-20 16:59:12 +08:00
zhengshuxin	138a6ae458	RPM: add version to 3.3.0-15	2017-09-19 18:26:44 +08:00
zhengshuxin	d1410faa0a	modify rpm version	2017-09-19 17:20:48 +08:00
zhengshuxin	fbc8ad7b9c	Fixed one bug in acl_udp_server.c when sending status to acl_master	2017-09-19 17:19:49 +08:00
zhengshuxin	fd66d9bbc4	fixed one bug in acl_udp_server.c when sending status to master	2017-09-19 17:16:36 +08:00
zhengshuxin	7f41de209f	modify protocol.md	2017-09-19 15:45:08 +08:00
zhengshuxin	7335f2a449	add master's web protocol in markdown file	2017-09-19 15:40:01 +08:00
zhengshuxin	1d1d70e27b	RPM: add changelog infomation	2017-09-19 13:57:58 +08:00
zhengshuxin	69694f8972	CI: add centos 5.8 & 5.9 for prerelease	2017-09-19 13:41:28 +08:00
zhengshuxin	4a1cf0c8b6	CI: replace zlib-static with zlib-devel	2017-09-19 13:36:09 +08:00
zhengshuxin	fdecd88517	CI: add centos5.8 & 5.9	2017-09-19 13:32:29 +08:00
zhengshuxin	aaaa7e6c97	CI: modify ci	2017-09-19 13:29:32 +08:00
zhengshuxin	c45081b8b5	CI: add test stage into ci	2017-09-19 13:25:07 +08:00
zhengshuxin	199f8c6e0c	CI: add zlib-static into ci	2017-09-19 13:20:15 +08:00
zhengshuxin	86d229de9a	add .gitlab-ci.yml	2017-09-19 11:51:10 +08:00
zhengshuxin	5a44b8c0dc	remove test codes from tcp_pool.cpp	2017-09-19 10:57:35 +08:00
zhengshuxin	785ec6dc95	merge tcp_pool.cpp	2017-09-19 10:55:33 +08:00
zsx	1aab9b1e14	add trigger.hpp into xcode project	2017-09-19 10:25:27 +08:00
zhengshuxin	31fc50166c	add trigger.hpp into all vc's projects; ... add trigger sample for fiber trigger;	2017-09-18 22:28:52 +08:00
zhengshuxin	08e241acb8	add trigger.hpp for trigger events by time.	2017-09-18 18:59:59 +08:00
zsxxsz	00b0561ce2	build acl on Android Studio2.3.3	2017-09-17 00:02:43 +08:00
zhengshuxin	00baff305f	rpm packaging to 3.3.0.12	2017-09-15 10:09:05 +08:00
郑树新	33ce9300d6	add project for Android Studio.	2017-09-13 18:57:12 +08:00
郑树新	0560c4f018	modify comments into thread_cond.hpp	2017-09-13 18:04:09 +08:00
郑树新	0ddf61cd7a	add comments into thread_cond.hpp & thread_mutex.hpp	2017-09-13 18:02:30 +08:00
郑树新	de4ec340a4	compiling ok on Android Studio	2017-09-13 11:30:27 +08:00
zhengshuxin	d5119d3ca1	Merge branch 'master' of https://github.com/zhengshuxin/acl into github-zsx-master	2017-09-13 11:26:28 +08:00
zhengshuxin	52b692221a	merge acl	2017-09-13 11:25:39 +08:00
zhengshuxin	8ada09778c	fixed bugs in acl_dlink.c for adding continuous integers; ... acl_dlink.c supports for adding negative integers.	2017-09-13 11:17:00 +08:00
zhengshuxin	3d864ea148	one compiling warning on clang5.0	2017-09-12 18:11:58 +08:00
zhengshuxin	dbea17b59d	add configure items into server templates' configures	2017-09-11 22:34:56 +08:00
zhengshuxin	32dede69de	add reload_timeout into main.cf of acl_master	2017-09-11 14:28:22 +08:00
zhengshuxin	70957fad04	invalid date submit from FreeBSD	2017-09-11 13:57:59 +08:00
zsx	cb1c642461	build ok for Macosx	2017-07-17 17:53:56 +08:00
zhengshuxin	b9283ffbf5	build ok on FreeBSD	2017-07-11 17:44:14 +08:00
zhengshuxin	e04cf8ec1b	build ok for FreeBSD	2017-09-11 11:59:39 +08:00
zhengshuxin	d5fe28dd8f	compile ok for centos5.x	2017-09-11 11:38:06 +08:00
郑树新	4ac182fdce	fixed compiling error on Windows by vc	2017-09-11 08:49:07 +08:00
zhengshuxin	5101ef3cc6	reload timeout can be set in acl_master	2017-09-10 17:54:07 +08:00
zhengshuxin	f17a0cd32e	modify configure content of server templates used by wizard	2017-09-10 17:39:51 +08:00
zhengshuxin	101ad0e6e1	fiber server template can tell master its status after reloading	2017-09-10 17:16:06 +08:00
zhengshuxin	5f3c319078	master can wait for the callback from children after reloading the specific service's children	2017-09-09 23:05:33 +08:00
zhengshuxin	a67e6a6338	sighup's result status from children can be got by acl_master	2017-09-09 00:30:39 +08:00
zhengshuxin	7d94dd5a04	let mbox::pop be blocked when timeout < 0	2017-09-08 19:18:49 +08:00
zhengshuxin	3d406e7277	init_conf_str_vars in master_params.cpp has memory leak when master reload configure.	2017-09-06 22:03:27 +08:00
zhengshuxin	1a36ede275	fiber_server.c supports setuping SIGTERM;	2017-09-06 15:46:39 +08:00
zhengshuxin	965ecddd16	remove watchdog from master's main.cpp	2017-09-06 13:31:12 +08:00
zhengshuxin	025a9b29f2	make master's reload safety	2017-09-06 13:19:49 +08:00
zhengshuxin	296d5a995d	master can wait until the children exited	2017-09-05 23:47:48 +08:00
zhengshuxin	bc7d725f5c	Merge branch 'master' of github:zhengshuxin/acl into github-zsx-master	2017-09-05 10:59:59 +08:00