From d124772d6a606af4ee73fbad3bef01634ed26e89 Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 8 Apr 2014 13:54:16 +0800 Subject: [PATCH] add http server/api to srs.conf. add comments for bug #6. --- trunk/conf/srs.conf | 9 +++++++++ trunk/src/app/srs_app_rtmp_conn.cpp | 2 ++ 2 files changed, 11 insertions(+) diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 2b8e15e5c..98090d47f 100644 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -4,5 +4,14 @@ listen 1935; srs_log_tank file; srs_log_file ./objs/srs.log; +http_api { + enabled on; + listen 1985; +} +http_stream { + enabled on; + listen 8080; + dir ./objs/nginx/html; +} vhost __defaultVhost__ { } diff --git a/trunk/src/app/srs_app_rtmp_conn.cpp b/trunk/src/app/srs_app_rtmp_conn.cpp index 0df3db74e..87e8aecc8 100644 --- a/trunk/src/app/srs_app_rtmp_conn.cpp +++ b/trunk/src/app/srs_app_rtmp_conn.cpp @@ -675,6 +675,8 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsCommonMessag } 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(msg->get_packet()); if (close) { ret = ERROR_CONTROL_RTMP_CLOSE;