From 6cea551c64b09ac840c364fec31f25034a0109c2 Mon Sep 17 00:00:00 2001 From: winlin Date: Sat, 11 Aug 2018 10:12:40 +0800 Subject: [PATCH] For #1110, Refine params in http callback. 2.0.253 --- README.md | 1 + trunk/src/app/srs_app_http_hooks.cpp | 14 +++----------- trunk/src/core/srs_core.hpp | 2 +- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index a6db56aa3..03193b3b8 100755 --- a/README.md +++ b/README.md @@ -333,6 +333,7 @@ Remark: ## History +* v2.0, 2018-08-11, For [#1110][bug #1110], Refine params in http callback. 2.0.253 * v2.0, 2018-08-05, Refine HTTP-FLV latency, support realtime mode. 2.0.252 * v2.0, 2018-08-04, For [#1110][bug #1110], Support params in http callback. 2.0.251 * v2.0, 2018-08-02, For [#1031][bug #1031], SRS edge support douyu.com. 2.0.250 diff --git a/trunk/src/app/srs_app_http_hooks.cpp b/trunk/src/app/srs_app_http_hooks.cpp index d63df4931..bca1467e7 100644 --- a/trunk/src/app/srs_app_http_hooks.cpp +++ b/trunk/src/app/srs_app_http_hooks.cpp @@ -131,15 +131,6 @@ int SrsHttpHooks::on_publish(string url, SrsRequest* req) int client_id = _srs_context->get_id(); - string stream = req->stream; - // Pass params in stream, @see https://github.com/ossrs/srs/issues/1031#issuecomment-409745733 - if (!req->param.empty()) { - if (req->param.find("?") != 0) { - stream += "?"; - } - stream += req->param; - } - std::stringstream ss; ss << SRS_JOBJECT_START << SRS_JFIELD_STR("action", "on_publish") << SRS_JFIELD_CONT @@ -148,7 +139,8 @@ int SrsHttpHooks::on_publish(string url, SrsRequest* req) << SRS_JFIELD_STR("vhost", req->vhost) << SRS_JFIELD_CONT << SRS_JFIELD_STR("app", req->app) << SRS_JFIELD_CONT << SRS_JFIELD_STR("tcUrl", req->tcUrl) << SRS_JFIELD_CONT // Add tcUrl for auth publish rtmp stream client - << SRS_JFIELD_STR("stream", stream) + << SRS_JFIELD_STR("stream", req->stream) << SRS_JFIELD_CONT + << SRS_JFIELD_STR("param", req->param) << SRS_JOBJECT_END; std::string data = ss.str(); @@ -181,7 +173,7 @@ void SrsHttpHooks::on_unpublish(string url, SrsRequest* req) << SRS_JFIELD_STR("ip", req->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("stream", req->stream)<< SRS_JFIELD_CONT + << SRS_JFIELD_STR("stream", req->stream) << SRS_JFIELD_CONT << SRS_JFIELD_STR("param", req->param) << SRS_JOBJECT_END; diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index b5444e807..7b49613ff 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 252 +#define VERSION_REVISION 253 // generated by configure, only macros. #include