From f089eafd9fdf10946b4ebd22e39c0303c75adb8b Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 4 Apr 2014 10:12:34 +0800 Subject: [PATCH] fix bug #38, remove app slash of jwplayer, change to 0.9.46 --- trunk/src/core/srs_core.hpp | 2 +- trunk/src/rtmp/srs_protocol_rtmp.cpp | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 4e7fd507c..c323f82a9 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 "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "45" +#define VERSION_REVISION "46" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "srs" diff --git a/trunk/src/rtmp/srs_protocol_rtmp.cpp b/trunk/src/rtmp/srs_protocol_rtmp.cpp index b8a4c7bde..5a99c7197 100644 --- a/trunk/src/rtmp/srs_protocol_rtmp.cpp +++ b/trunk/src/rtmp/srs_protocol_rtmp.cpp @@ -131,7 +131,11 @@ int SrsRequest::discovery_app() // remove the unsupported chars in names. vhost = srs_string_remove(vhost, "/ \n\r\t"); app = srs_string_remove(app, " \n\r\t"); - stream = srs_string_remove(stream, "/ \n\r\t"); + stream = srs_string_remove(stream, " \n\r\t"); + + // remove end slash of app + app = srs_string_trim_end(app, "/"); + stream = srs_string_trim_end(stream, "/"); return ret; }