[FFmpeg-cvslog] ffserver: Try matching the RTSP url without a trailing slash

[Martin Storsjö]

ffmpeg | branch: master | Martin Storsj? <martin at martin.st> | Wed Feb 16 16:37:40 2011 +0200| [003c32e72cb675b271d5434858899970000f369a] | committer: Michael Niedermayer

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)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=003c32e72cb675b271d5434858899970000f369a
---

 ffserver.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/ffserver.c b/ffserver.c
index 20ba890..74bce85 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;
 }