胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
dd2c7e0b 2 parents 7f60d472 247b7724

hotfix to remove the pageUrl for http callback. 2.0.88

内嵌 并排对比
正在显示 3 个修改的文件 包含 4 行增加 和 7 行删除
@@ -501,6 +501,7 @@ Supported operating systems and hardware: @@ -501,6 +501,7 @@ Supported operating systems and hardware:
501 * 2013-10-17, Created.<br/> 501 * 2013-10-17, Created.<br/>
502 502
503 ## History 503 ## History
  504 +* v2.0, 2015-01-03, hotfix to remove the pageUrl for http callback. 2.0.88
504 * v2.0, 2015-01-03, fix [#179](https://github.com/winlinvip/simple-rtmp-server/issues/179), dvr support custom filepath by variables. 2.0.87 505 * v2.0, 2015-01-03, fix [#179](https://github.com/winlinvip/simple-rtmp-server/issues/179), dvr support custom filepath by variables. 2.0.87
505 * v2.0, 2015-01-02, fix [#211](https://github.com/winlinvip/simple-rtmp-server/issues/211), support security allow/deny publish/play all/ip. 2.0.86 506 * v2.0, 2015-01-02, fix [#211](https://github.com/winlinvip/simple-rtmp-server/issues/211), support security allow/deny publish/play all/ip. 2.0.86
506 * v2.0, 2015-01-02, hotfix [#207](https://github.com/winlinvip/simple-rtmp-server/issues/207), trim the last 0 of log. 2.0.85 507 * v2.0, 2015-01-02, hotfix [#207](https://github.com/winlinvip/simple-rtmp-server/issues/207), trim the last 0 of log. 2.0.85
@@ -552,6 +553,7 @@ Supported operating systems and hardware: @@ -552,6 +553,7 @@ Supported operating systems and hardware:
552 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1. 553 * v2.0, 2014-10-18, remove supports for OSX(darwin). 2.0.1.
553 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0. 554 * v2.0, 2014-10-16, revert github srs README to English. 2.0.0.
554 555
  556 +* v1.0, 2015-01-03, hotfix to remove the pageUrl for http callback. 1.0.19
555 * 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 557 * 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
556 * 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 558 * 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
557 * 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 559 * 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
@@ -122,8 +122,7 @@ void SrsHttpHooks::on_close(string url, int client_id, string ip, SrsRequest* re @@ -122,8 +122,7 @@ void SrsHttpHooks::on_close(string url, int client_id, string ip, SrsRequest* re
122 << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT 122 << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
123 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 123 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
124 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 124 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
125 - << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT  
126 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) 125 + << __SRS_JFIELD_STR("app", req->app)
127 << __SRS_JOBJECT_END; 126 << __SRS_JOBJECT_END;
128 std::string data = ss.str(); 127 std::string data = ss.str();
129 std::string res; 128 std::string res;
@@ -178,7 +177,6 @@ int SrsHttpHooks::on_publish(string url, int client_id, string ip, SrsRequest* r @@ -178,7 +177,6 @@ int SrsHttpHooks::on_publish(string url, int client_id, string ip, SrsRequest* r
178 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 177 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
179 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 178 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
180 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 179 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
181 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
182 << __SRS_JFIELD_STR("stream", req->stream) 180 << __SRS_JFIELD_STR("stream", req->stream)
183 << __SRS_JOBJECT_END; 181 << __SRS_JOBJECT_END;
184 std::string data = ss.str(); 182 std::string data = ss.str();
@@ -234,7 +232,6 @@ void SrsHttpHooks::on_unpublish(string url, int client_id, string ip, SrsRequest @@ -234,7 +232,6 @@ void SrsHttpHooks::on_unpublish(string url, int client_id, string ip, SrsRequest
234 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 232 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
235 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 233 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
236 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 234 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
237 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
238 << __SRS_JFIELD_STR("stream", req->stream) 235 << __SRS_JFIELD_STR("stream", req->stream)
239 << __SRS_JOBJECT_END; 236 << __SRS_JOBJECT_END;
240 std::string data = ss.str(); 237 std::string data = ss.str();
@@ -290,7 +287,6 @@ int SrsHttpHooks::on_play(string url, int client_id, string ip, SrsRequest* req) @@ -290,7 +287,6 @@ int SrsHttpHooks::on_play(string url, int client_id, string ip, SrsRequest* req)
290 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 287 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
291 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 288 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
292 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 289 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
293 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
294 << __SRS_JFIELD_STR("stream", req->stream) 290 << __SRS_JFIELD_STR("stream", req->stream)
295 << __SRS_JOBJECT_END; 291 << __SRS_JOBJECT_END;
296 std::string data = ss.str(); 292 std::string data = ss.str();
@@ -346,7 +342,6 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req @@ -346,7 +342,6 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req
346 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 342 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
347 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 343 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
348 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 344 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
349 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
350 << __SRS_JFIELD_STR("stream", req->stream) 345 << __SRS_JFIELD_STR("stream", req->stream)
351 << __SRS_JOBJECT_END; 346 << __SRS_JOBJECT_END;
352 std::string data = ss.str(); 347 std::string data = ss.str();
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
31 // current release version 31 // current release version
32 #define VERSION_MAJOR 2 32 #define VERSION_MAJOR 2
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 87 34 +#define VERSION_REVISION 88
35 // server info. 35 // server info.
36 #define RTMP_SIG_SRS_KEY "SRS" 36 #define RTMP_SIG_SRS_KEY "SRS"
37 #define RTMP_SIG_SRS_ROLE "origin/edge server" 37 #define RTMP_SIG_SRS_ROLE "origin/edge server"