Commit f5c5d57b authored by Martin Storsjö's avatar Martin Storsjö

http: Reorder two code blocks

This is in preparation for a later commit.
Signed-off-by: default avatarMartin Storsjö <martin@martin.st>
parent 9f1dae94
......@@ -110,6 +110,14 @@ static int http_open_cnx(URLContext *h)
path1, sizeof(path1), s->location);
ff_url_join(hoststr, sizeof(hoststr), NULL, NULL, hostname, port, NULL);
if (!strcmp(proto, "https")) {
lower_proto = "tls";
if (port < 0)
port = 443;
}
if (port < 0)
port = 80;
if (path1[0] == '\0')
path = "/";
else
......@@ -124,13 +132,6 @@ static int http_open_cnx(URLContext *h)
av_url_split(NULL, 0, proxyauth, sizeof(proxyauth),
hostname, sizeof(hostname), &port, NULL, 0, proxy_path);
}
if (!strcmp(proto, "https")) {
lower_proto = "tls";
if (port < 0)
port = 443;
}
if (port < 0)
port = 80;
ff_url_join(buf, sizeof(buf), lower_proto, NULL, hostname, port, NULL);
err = ffurl_open(&hd, buf, AVIO_FLAG_READ_WRITE,
......
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