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
2015-01-03 15:07:12 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
247b772449ad7cf60adfdd44bd7b85aa70bb0c29
247b7724
1 parent
f9a33fbe
hotfix to remove the pageUrl for http callback. 1.0.19
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
3 行增加
和
7 行删除
README.md
trunk/src/app/srs_app_http_hooks.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
247b772
...
...
@@ -383,6 +383,7 @@ Supported operating systems and hardware:
*
2013-10-17, Created.
<br/>
## History
*
v1.0, 2015-01-03, hotfix to remove the pageUrl for http callback. 1.0.19
*
v1.0, 2015-01-02, hotfix
[
#207
](
https://github.com/winlinvip/simple-rtmp-server/issues/207
)
, trim the last 0 of log. 1.0.18
*
v1.0, 2015-01-02, hotfix
[
#216
](
https://github.com/winlinvip/simple-rtmp-server/issues/216
)
, http-callback post in application/json content-type. 1.0.17
*
v1.0, 2015-01-01, hotfix
[
#270
](
https://github.com/winlinvip/simple-rtmp-server/issues/270
)
, memory leak for http client post. 1.0.16
...
...
trunk/src/app/srs_app_http_hooks.cpp
查看文件 @
247b772
...
...
@@ -112,8 +112,7 @@ void SrsHttpHooks::on_close(string url, int client_id, string ip, SrsRequest* re
<<
__SRS_JFIELD_ORG
(
"client_id"
,
client_id
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"ip"
,
ip
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"vhost"
,
req
->
vhost
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"app"
,
req
->
app
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"pageUrl"
,
req
->
pageUrl
)
<<
__SRS_JFIELD_STR
(
"app"
,
req
->
app
)
<<
__SRS_JOBJECT_END
;
std
::
string
data
=
ss
.
str
();
std
::
string
res
;
...
...
@@ -158,7 +157,6 @@ int SrsHttpHooks::on_publish(string url, int client_id, string ip, SrsRequest* r
<<
__SRS_JFIELD_STR
(
"ip"
,
ip
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"vhost"
,
req
->
vhost
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"app"
,
req
->
app
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"pageUrl"
,
req
->
pageUrl
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"stream"
,
req
->
stream
)
<<
__SRS_JOBJECT_END
;
std
::
string
data
=
ss
.
str
();
...
...
@@ -204,7 +202,6 @@ void SrsHttpHooks::on_unpublish(string url, int client_id, string ip, SrsRequest
<<
__SRS_JFIELD_STR
(
"ip"
,
ip
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"vhost"
,
req
->
vhost
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"app"
,
req
->
app
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"pageUrl"
,
req
->
pageUrl
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"stream"
,
req
->
stream
)
<<
__SRS_JOBJECT_END
;
std
::
string
data
=
ss
.
str
();
...
...
@@ -250,7 +247,6 @@ int SrsHttpHooks::on_play(string url, int client_id, string ip, SrsRequest* req)
<<
__SRS_JFIELD_STR
(
"ip"
,
ip
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"vhost"
,
req
->
vhost
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"app"
,
req
->
app
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"pageUrl"
,
req
->
pageUrl
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"stream"
,
req
->
stream
)
<<
__SRS_JOBJECT_END
;
std
::
string
data
=
ss
.
str
();
...
...
@@ -296,7 +292,6 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req
<<
__SRS_JFIELD_STR
(
"ip"
,
ip
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"vhost"
,
req
->
vhost
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"app"
,
req
->
app
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"pageUrl"
,
req
->
pageUrl
)
<<
__SRS_JFIELD_CONT
<<
__SRS_JFIELD_STR
(
"stream"
,
req
->
stream
)
<<
__SRS_JOBJECT_END
;
std
::
string
data
=
ss
.
str
();
...
...
trunk/src/core/srs_core.hpp
查看文件 @
247b772
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 1
8
#define VERSION_REVISION 1
9
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
请
注册
或
登录
后发表评论