1721 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	d4c2aa1e8e	add __openssl_compute_key to calc the shared key	2014-08-08 11:34:17 +08:00
winlin	7adbe7f456	fix utest build failed, sync with src changed.	2014-08-08 10:47:55 +08:00
winlin	ad2c996bd8	refine HMAC sha256 digest algorithm. 0.9.193	2014-08-08 09:57:36 +08:00
winlin	69071ae2dc	Merge branch 'master' of github.com:winlinvip/simple-rtmp-server	2014-08-08 09:57:25 +08:00
winlin	12ad95a5b8	refine HMAC sha256 digest algorithm. 0.9.193	2014-08-08 09:54:33 +08:00
winlin	27698ef3c1	Update DONATIONS.txt	2014-08-07 23:01:37 +08:00
winlin	5f686135bb	Update DONATIONS.txt	2014-08-07 23:00:15 +08:00
winlin	156a9ed2a3	change to 0.9.192.	2014-08-07 14:43:03 +08:00
winlin	1ebaab2c6e	fix #148, simplify the RTMP handshake key generation. 0.9.191.	2014-08-06 15:45:40 +08:00
winlin	a9d28122f4	refine code, refine the handshake, refine the log of source_id	2014-08-06 13:57:55 +08:00
winlin	5b28355a0b	fix #147, support identify the srs edge. 0.9.190.	2014-08-06 09:57:30 +08:00
winlin	3532b61e3d	open all utest macro	2014-08-05 09:16:45 +08:00
winlin	798f9139a4	add reload utest.	2014-08-05 09:16:25 +08:00
winlin	daa382fee5	update donations.	2014-08-04 11:31:26 +08:00
winlin	33bc8755ab	refine code, add comments for ossrs.net monitor.	2014-08-04 10:50:28 +08:00
winlin	b703bb0fb5	update use nginx of ossrs.net	2014-08-03 22:32:47 +08:00
winlin	cc2633902a	for 1.0 mainline7, 0.9.189, update readme.	2014-08-03 22:23:56 +08:00
winlin	902ae58534	for 1.0 mainline7, 0.9.189, update readme.	2014-08-03 22:12:38 +08:00
winlin	67403bdbf1	fix #79, fix the reload remove edge assert bug. 0.9.189.	2014-08-03 21:50:48 +08:00
winlin	ade2376da0	fix #57, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188.	2014-08-03 21:22:40 +08:00
winlin	6dd065bcc3	fix #85, fix the segment-dvr sequence header missing. 0.9.187.	2014-08-03 20:27:57 +08:00
winlin	5a95d594e7	fix #145, refine ffmpeg log, check abitrate for libaacplus. 0.9.186.	2014-08-03 13:06:37 +08:00
winlin	d5ba529d32	fix #143, fix retrieve sys stat bug for all linux. 0.9.185.	2014-08-03 10:42:01 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	84450e1588	fix #138, fix http hooks bug, regression bug. 0.9.184.	2014-08-02 19:24:49 +08:00
winlin	721acc350a	fix #142, tcp stat slow bug, use /proc/net/sockstat instead, refer to 'ss -s'. 0.9.183.	2014-08-02 09:54:21 +08:00
winlin	d5f03200a7	revert tcp stat. need more refine. 0.9.182	2014-08-01 23:08:52 +08:00
winlin	f7fdbe6848	update get connections thread to sleep 10ms per 1000 connectios. 0.9.181	2014-08-01 22:52:40 +08:00
winlin	15d4993cc3	slowdown the cpu usage for srs to calc connections when too many connections. 0.9.180	2014-08-01 22:43:12 +08:00
winlin	6539ce69f4	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	2014-07-31 10:39:39 +08:00
winlin	f0ffdcc0ae	fix #141, support tun0(vpn network device) ip retrieve. 0.9.179.	2014-07-31 10:37:34 +08:00
winlin	b5e5dad8b1	update donations.	2014-07-30 14:13:55 +08:00
winlin	a9cd5b5d24	update donations	2014-07-30 11:36:21 +08:00
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	2014-07-30 10:00:23 +08:00
winlin	83d1e7288c	Merge pull request #137 from T-bagwell/master ... Update README.md	2014-07-29 11:36:57 +08:00
winlin	792a6f944f	refine utility of cpu, add comment for cpu percent	2014-07-28 13:51:54 +08:00
winlin	c16d3585a5	refine utility of cpu, add comment for cpu percent	2014-07-28 13:41:27 +08:00
Steven Liu	3ff3938c8e	Update README.md ... Update the Support platform from IOS to OSX IOS is Embeded platform OS for Apple, OSX is the X86 or PowerPC Platform OS for MacBook, IMac, Or Apple PC OS	2014-07-28 08:29:21 +08:00
winlin	118ec29f8e	refine the code for ios build. add authors StevenLiu. 0.9.177	2014-07-27 21:57:22 +08:00
winlin	e37f312f27	refine the code for ios build. add authors StevenLiu. 0.9.177	2014-07-27 21:56:44 +08:00
winlin	b198d17ab9	Merge pull request #135 from T-bagwell/master ... Support porting srs on MacOS OSX system Platform	2014-07-27 21:07:37 +08:00
Steven Liu	b50ecd6dbe	Support porting srs on MacOS OSX system Platform ... Add the OSX platform cross complie options into srs	2014-07-27 19:32:12 +08:00
winlin	37ceadd865	sync the conf file	2014-07-27 19:11:51 +08:00
winlin	9c11001391	refine log for stats network and disk	2014-07-27 19:03:56 +08:00
winlin	6f700f3f40	rename network_device_index to network	2014-07-27 18:40:32 +08:00
winlin	f4ea48adcb	rename network_device_index to network	2014-07-27 18:39:20 +08:00
winlin	b8ae5c63fc	add disk io test command	2014-07-27 18:05:54 +08:00
winlin	42464cbe1f	add disk io test command	2014-07-27 17:59:19 +08:00
winlin	4f4b15f500	refine the disk iops stat, get cpu info.	2014-07-27 17:46:31 +08:00
winlin	ef7a02e643	refine the disk io busy, can >1	2014-07-27 17:23:07 +08:00