Commit 8f7c2452 authored by Martin Storsjö's avatar Martin Storsjö

applehttp: Allow the base url to be a local file name, too

Originally committed as revision 25316 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2e0559b7
......@@ -90,7 +90,7 @@ static void make_absolute_url(char *buf, int size, const char *base,
const char *rel)
{
char *sep;
if (!base || strstr(rel, "://")) {
if (!base || strstr(rel, "://") || rel[0] == '/') {
av_strlcpy(buf, rel, size);
return;
}
......@@ -99,13 +99,15 @@ static void make_absolute_url(char *buf, int size, const char *base,
sep = strrchr(buf, '/');
if (sep)
sep[1] = '\0';
while (av_strstart(rel, "../", NULL)) {
if (sep) {
else
buf[0] = '\0';
while (av_strstart(rel, "../", NULL) && sep) {
sep[0] = '\0';
sep = strrchr(buf, '/');
if (sep)
sep[1] = '\0';
}
else
buf[0] = '\0';
rel += 3;
}
av_strlcat(buf, rel, size);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment