Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-08-03 21:50:48 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
67403bdbf154d06519f8f2d1b9d1d7587d168225
67403bdb
1 parent
ade2376d
fix #79, fix the reload remove edge assert bug. 0.9.189.
显示空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
12 行增加
和
2 行删除
README.md
trunk/src/app/srs_app_edge.cpp
trunk/src/core/srs_core.hpp
trunk/src/kernel/srs_kernel_error.hpp
README.md
查看文件 @
67403bd
...
...
@@ -207,6 +207,7 @@ Supported operating systems and hardware:
*
2013-10-17, Created.
<br/>
## History
*
v1.0, 2014-08-03, fix
[
#79
](
https://github.com/winlinvip/simple-rtmp-server/issues/79
)
, fix the reload remove edge assert bug. 0.9.189.
*
v1.0, 2014-08-03, fix
[
#57
](
https://github.com/winlinvip/simple-rtmp-server/issues/57
)
, use lock(acquire/release publish) to avoid duplicated publishing. 0.9.188.
*
v1.0, 2014-08-03, fix
[
#85
](
https://github.com/winlinvip/simple-rtmp-server/issues/85
)
, fix the segment-dvr sequence header missing. 0.9.187.
*
v1.0, 2014-08-03, fix
[
#145
](
https://github.com/winlinvip/simple-rtmp-server/issues/145
)
, refine ffmpeg log, check abitrate for libaacplus. 0.9.186.
...
...
trunk/src/app/srs_app_edge.cpp
查看文件 @
67403bd
...
...
@@ -279,7 +279,15 @@ int SrsEdgeIngester::connect_server()
close_underlayer_socket
();
SrsConfDirective
*
conf
=
_srs_config
->
get_vhost_edge_origin
(
_req
->
vhost
);
srs_assert
(
conf
);
// @see https://github.com/winlinvip/simple-rtmp-server/issues/79
// when origin is error, for instance, server is shutdown,
// then user remove the vhost then reload, the conf is empty.
if
(
!
conf
)
{
ret
=
ERROR_EDGE_VHOST_REMOVED
;
srs_warn
(
"vhost %s removed. ret=%d"
,
_req
->
vhost
.
c_str
(),
ret
);
return
ret
;
}
// select the origin.
std
::
string
server
=
conf
->
args
.
at
(
origin_index
%
conf
->
args
.
size
());
...
...
trunk/src/core/srs_core.hpp
查看文件 @
67403bd
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR "0"
#define VERSION_MINOR "9"
#define VERSION_REVISION "18
8
"
#define VERSION_REVISION "18
9
"
#define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
...
...
trunk/src/kernel/srs_kernel_error.hpp
查看文件 @
67403bd
...
...
@@ -180,6 +180,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define ERROR_KERNEL_FLV_HEADER 3036
#define ERROR_KERNEL_FLV_STREAM_CLOSED 3037
#define ERROR_KERNEL_STREAM_INIT 3038
#define ERROR_EDGE_VHOST_REMOVED 3039
/**
* whether the error code is an system control error.
...
...
请
注册
或
登录
后发表评论