external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

add http server/api to srs.conf. add comments for bug #6.

Browse source
This commit is contained in:
winlin 2014-04-08 13:54:16 +08:00
parent d6d371eba6
commit d124772d6a
2 changed files with 11 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

9
trunk/conf/srs.conf
View file

@ -4,5 +4,14 @@
listen 1935; listen 1935;
srs_log_tank file; srs_log_tank file;
srs_log_file ./objs/srs.log; srs_log_file ./objs/srs.log;
http_api {
enabled on;
listen 1985;
}
http_stream {
enabled on;
listen 8080;
dir ./objs/nginx/html;
}
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

2
trunk/src/app/srs_app_rtmp_conn.cpp
View file

@ -675,6 +675,8 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsCommonMessag
} }
srs_info("decode the amf0/amf3 command packet success."); srs_info("decode the amf0/amf3 command packet success.");
// for jwplayer/flowplayer, which send close as pause message.
// @see https://github.com/winlinvip/simple-rtmp-server/issues/6
SrsCloseStreamPacket* close = dynamic_cast<SrsCloseStreamPacket*>(msg->get_packet()); SrsCloseStreamPacket* close = dynamic_cast<SrsCloseStreamPacket*>(msg->get_packet());
if (close) { if (close) {
ret = ERROR_CONTROL_RTMP_CLOSE; ret = ERROR_CONTROL_RTMP_CLOSE;