winlin

fix bug #38, remove app slash of jwplayer, change to 0.9.46

@@ -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 "0" 32 #define VERSION_MAJOR "0"
33 #define VERSION_MINOR "9" 33 #define VERSION_MINOR "9"
34 -#define VERSION_REVISION "45" 34 +#define VERSION_REVISION "46"
35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION 35 #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION
36 // server info. 36 // server info.
37 #define RTMP_SIG_SRS_KEY "srs" 37 #define RTMP_SIG_SRS_KEY "srs"
@@ -131,7 +131,11 @@ int SrsRequest::discovery_app() @@ -131,7 +131,11 @@ int SrsRequest::discovery_app()
131 // remove the unsupported chars in names. 131 // remove the unsupported chars in names.
132 vhost = srs_string_remove(vhost, "/ \n\r\t"); 132 vhost = srs_string_remove(vhost, "/ \n\r\t");
133 app = srs_string_remove(app, " \n\r\t"); 133 app = srs_string_remove(app, " \n\r\t");
134 - stream = srs_string_remove(stream, "/ \n\r\t"); 134 + stream = srs_string_remove(stream, " \n\r\t");
  135 +
  136 + // remove end slash of app
  137 + app = srs_string_trim_end(app, "/");
  138 + stream = srs_string_trim_end(stream, "/");
135 139
136 return ret; 140 return ret;
137 } 141 }