25 commits

Author	SHA1	Message	Date
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	815f2491a4	merge from 2.0	2016-09-05 09:39:20 +08:00
winlin	6ec60b0a21	fix memory leak at handshake. 2.0.213	2016-09-05 09:38:30 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	65b81a4e68	merge from srs2	2015-12-22 17:01:06 +08:00
winlin	8d378cda2e	for #418, when simple handshake, copy s1 to c2.	2015-12-22 16:48:06 +08:00
winlin	6191e0af90	s1 compute key.	2015-11-30 19:05:25 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	2015-11-02 11:29:20 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00
winlin	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	82ff05c1d4	rename rtmp io to protocol io	2015-09-22 09:07:07 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	a4f51564db	rename kernel stream to buffer	2015-09-22 08:48:55 +08:00
winlin	eb578b4a39	refine the thread, set to disposed when terminate normally	2015-09-14 17:17:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	24616e15b5	remove the code for xcode, not required.	2015-03-10 18:33:32 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00

Renamed from trunk/src/rtmp/srs_protocol_handshake.cpp (Browse further)