Browse Source

applehttp: Handle absolute paths relative to the current server

This fixes roundup issue 2583.

Signed-off-by: Ronald S. Bultje <rsbultje@gmail.com>
(cherry picked from commit 185a155e57)
tags/n0.8
Martin Storsjö Michael Niedermayer 15 years ago
parent
commit
105ba7dc28
1 changed files with 14 additions and 0 deletions
  1. +14
    -0
      libavformat/applehttp.c

+ 14
- 0
libavformat/applehttp.c View File

@@ -90,6 +90,20 @@ static void make_absolute_url(char *buf, int size, const char *base,
const char *rel)
{
char *sep;
/* Absolute path, relative to the current server */
if (base && strstr(base, "://") && rel[0] == '/') {
if (base != buf)
av_strlcpy(buf, base, size);
sep = strstr(buf, "://");
if (sep) {
sep += 3;
sep = strchr(sep, '/');
if (sep)
*sep = '\0';
}
av_strlcat(buf, rel, size);
return;
}
/* If rel actually is an absolute url, just copy it */
if (!base || strstr(rel, "://") || rel[0] == '/') {
av_strlcpy(buf, rel, size);


Loading…
Cancel
Save