From 944be9d24bbf748ce65feda44e8df75fd1950bc6 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 10 Jan 2013 14:11:26 +0100 Subject: Fix lots of bugs in mp_http URL handling Many instances of "http" were not changed to "mp_http", which made many aspects of the mp_http protocol handler broken. --- stream/url.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'stream/url.c') diff --git a/stream/url.c b/stream/url.c index 7919a356f1..70d2db4ea5 100644 --- a/stream/url.c +++ b/stream/url.c @@ -61,7 +61,7 @@ end: } static int is_proxy(const URL_t *url) { - return !strcasecmp(url->protocol, "http_proxy") && url->file && strstr(url->file, "://"); + return !strcasecmp(url->protocol, "mp_http_proxy") && url->file && strstr(url->file, "://"); } int url_is_protocol(const URL_t *url, const char *proto) { @@ -137,12 +137,12 @@ static char *get_noauth_url(const URL_t *url) char *get_http_proxy_url(const URL_t *proxy, const char *host_url) { if (proxy->username) - return mp_asprintf("http_proxy://%s:%s@%s:%d/%s", + return mp_asprintf("mp_http_proxy://%s:%s@%s:%d/%s", proxy->username, proxy->password ? proxy->password : "", proxy->hostname, proxy->port, host_url); else - return mp_asprintf("http_proxy://%s:%d/%s", + return mp_asprintf("mp_http_proxy://%s:%d/%s", proxy->hostname, proxy->port, host_url); } -- cgit v1.2.3