diff options
| author | Rudolf Polzer <divverent@xonotic.org> | 2013-01-10 14:11:26 +0100 |
|---|---|---|
| committer | Rudolf Polzer <divverent@xonotic.org> | 2013-01-10 14:11:26 +0100 |
| commit | 944be9d24bbf748ce65feda44e8df75fd1950bc6 (patch) | |
| tree | 0ebd2d3cc656820f089aef32b7cbd8127340f0d6 /stream/url.c | |
| parent | 7c40d8a36ef48ca7216e3d8f4eddf19e70d419e5 (diff) | |
| download | mpv-944be9d24bbf748ce65feda44e8df75fd1950bc6.tar.bz2 mpv-944be9d24bbf748ce65feda44e8df75fd1950bc6.tar.xz | |
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.
Diffstat (limited to 'stream/url.c')
| -rw-r--r-- | stream/url.c | 6 |
1 files changed, 3 insertions, 3 deletions
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); } |