diff options
author | Martin Storsjö <martin@martin.st> | 2011-02-16 16:37:40 +0200 |
---|---|---|
committer | Luca Barbato <lu_zero@gentoo.org> | 2011-02-17 23:18:46 +0100 |
commit | c2ca851b234e169b50730ef357aeade8047491eb (patch) | |
tree | 51d56176c012cf35fbfa06070d9fc9baf608c35e /ffserver.c | |
parent | c3dbfa1afd7d989e3bba4c6bfc492a52c012e9b3 (diff) | |
download | ffmpeg-c2ca851b234e169b50730ef357aeade8047491eb.tar.gz |
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.
Diffstat (limited to 'ffserver.c')
-rw-r--r-- | ffserver.c | 6 |
1 files changed, 5 insertions, 1 deletions
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; } |