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
2016-01-09 16:06:22 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
eac54405593595dd559c887043d8b0f92290ac54
eac54405
2 parents
d24aef50
da722b5b
merge from srs2 #558 #559
隐藏空白字符变更
内嵌
并排对比
正在显示
2 个修改的文件
包含
1 行增加
和
5 行删除
trunk/src/app/srs_app_http_hooks.cpp
trunk/src/app/srs_app_st.cpp
trunk/src/app/srs_app_http_hooks.cpp
查看文件 @
eac5440
...
...
@@ -144,6 +144,7 @@ int SrsHttpHooks::on_publish(string url, SrsRequest* req)
obj
->
set
(
"ip"
,
SrsJsonAny
::
str
(
req
->
ip
.
c_str
()));
obj
->
set
(
"vhost"
,
SrsJsonAny
::
str
(
req
->
vhost
.
c_str
()));
obj
->
set
(
"app"
,
SrsJsonAny
::
str
(
req
->
app
.
c_str
()));
obj
->
set
(
"tcUrl"
,
SrsJsonAny
::
str
(
req
->
tcUrl
.
c_str
()));
obj
->
set
(
"stream"
,
SrsJsonAny
::
str
(
req
->
stream
.
c_str
()));
std
::
string
data
=
obj
->
dumps
();
...
...
trunk/src/app/srs_app_st.cpp
查看文件 @
eac5440
...
...
@@ -237,11 +237,6 @@ namespace internal
// readly terminated now.
really_terminated
=
true
;
// when thread terminated normally, also disposed.
// we must set to disposed before the on_thread_stop, which may free the thread.
// @see https://github.com/ossrs/srs/issues/546
disposed
=
true
;
handler
->
on_thread_stop
();
srs_info
(
"thread %s cycle finished"
,
_name
);
}
...
...
请
注册
或
登录
后发表评论