胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
247b7724 1 parent f9a33fbe

hotfix to remove the pageUrl for http callback. 1.0.19

内嵌 并排对比
正在显示 3 个修改的文件 包含 3 行增加 和 7 行删除
@@ -383,6 +383,7 @@ Supported operating systems and hardware: @@ -383,6 +383,7 @@ Supported operating systems and hardware:
383 * 2013-10-17, Created.<br/> 383 * 2013-10-17, Created.<br/>
384 384
385 ## History 385 ## History
  386 +* v1.0, 2015-01-03, hotfix to remove the pageUrl for http callback. 1.0.19
386 * 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 387 * 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
387 * 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 388 * 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
388 * 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 389 * 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
@@ -112,8 +112,7 @@ void SrsHttpHooks::on_close(string url, int client_id, string ip, SrsRequest* re @@ -112,8 +112,7 @@ void SrsHttpHooks::on_close(string url, int client_id, string ip, SrsRequest* re
112 << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT 112 << __SRS_JFIELD_ORG("client_id", client_id) << __SRS_JFIELD_CONT
113 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 113 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
114 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 114 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
115 - << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT  
116 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) 115 + << __SRS_JFIELD_STR("app", req->app)
117 << __SRS_JOBJECT_END; 116 << __SRS_JOBJECT_END;
118 std::string data = ss.str(); 117 std::string data = ss.str();
119 std::string res; 118 std::string res;
@@ -158,7 +157,6 @@ int SrsHttpHooks::on_publish(string url, int client_id, string ip, SrsRequest* r @@ -158,7 +157,6 @@ int SrsHttpHooks::on_publish(string url, int client_id, string ip, SrsRequest* r
158 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 157 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
159 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 158 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
160 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 159 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
161 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
162 << __SRS_JFIELD_STR("stream", req->stream) 160 << __SRS_JFIELD_STR("stream", req->stream)
163 << __SRS_JOBJECT_END; 161 << __SRS_JOBJECT_END;
164 std::string data = ss.str(); 162 std::string data = ss.str();
@@ -204,7 +202,6 @@ void SrsHttpHooks::on_unpublish(string url, int client_id, string ip, SrsRequest @@ -204,7 +202,6 @@ void SrsHttpHooks::on_unpublish(string url, int client_id, string ip, SrsRequest
204 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 202 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
205 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 203 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
206 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 204 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
207 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
208 << __SRS_JFIELD_STR("stream", req->stream) 205 << __SRS_JFIELD_STR("stream", req->stream)
209 << __SRS_JOBJECT_END; 206 << __SRS_JOBJECT_END;
210 std::string data = ss.str(); 207 std::string data = ss.str();
@@ -250,7 +247,6 @@ int SrsHttpHooks::on_play(string url, int client_id, string ip, SrsRequest* req) @@ -250,7 +247,6 @@ int SrsHttpHooks::on_play(string url, int client_id, string ip, SrsRequest* req)
250 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 247 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
251 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 248 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
252 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 249 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
253 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
254 << __SRS_JFIELD_STR("stream", req->stream) 250 << __SRS_JFIELD_STR("stream", req->stream)
255 << __SRS_JOBJECT_END; 251 << __SRS_JOBJECT_END;
256 std::string data = ss.str(); 252 std::string data = ss.str();
@@ -296,7 +292,6 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req @@ -296,7 +292,6 @@ void SrsHttpHooks::on_stop(string url, int client_id, string ip, SrsRequest* req
296 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT 292 << __SRS_JFIELD_STR("ip", ip) << __SRS_JFIELD_CONT
297 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT 293 << __SRS_JFIELD_STR("vhost", req->vhost) << __SRS_JFIELD_CONT
298 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT 294 << __SRS_JFIELD_STR("app", req->app) << __SRS_JFIELD_CONT
299 - << __SRS_JFIELD_STR("pageUrl", req->pageUrl) << __SRS_JFIELD_CONT  
300 << __SRS_JFIELD_STR("stream", req->stream) 295 << __SRS_JFIELD_STR("stream", req->stream)
301 << __SRS_JOBJECT_END; 296 << __SRS_JOBJECT_END;
302 std::string data = ss.str(); 297 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 1 32 #define VERSION_MAJOR 1
33 #define VERSION_MINOR 0 33 #define VERSION_MINOR 0
34 -#define VERSION_REVISION 18 34 +#define VERSION_REVISION 19
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"