From 003c32e72cb675b271d5434858899970000f369a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Storsj=C3=B6?= Date: Wed, 16 Feb 2011 16:37:40 +0200 Subject: [PATCH] ffserver: Try matching the RTSP url without a trailing slash If the client sends PLAY/PAUSE requests with the same url as specified in Content-Base, these requests may have urls with trailing slashes. (cherry picked from commit c2ca851b234e169b50730ef357aeade8047491eb) --- ffserver.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ffserver.c b/ffserver.c index 20ba890e4d..74bce851b9 100644 --- a/ffserver.c +++ b/ffserver.c @@ -3199,7 +3199,7 @@ static HTTPContext *find_rtp_session_with_url(const char *url, char path1[1024]; const char *path; char buf[1024]; - int s; + int s, len; rtp_c = find_rtp_session(session_id); if (!rtp_c) @@ -3219,6 +3219,10 @@ static HTTPContext *find_rtp_session_with_url(const char *url, return rtp_c; } } + len = strlen(path); + if (len > 0 && path[len - 1] == '/' && + !strncmp(path, rtp_c->stream->filename, len - 1)) + return rtp_c; return NULL; }