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/network.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/network.c')
| -rw-r--r-- | stream/network.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/stream/network.c b/stream/network.c index 56e5a1b5e1..d48444faa6 100644 --- a/stream/network.c +++ b/stream/network.c @@ -110,12 +110,12 @@ check4proxies( const URL_t *url ) { URL_t *url_out = NULL; if( url==NULL ) return NULL; url_out = url_new( url->url ); - if( !strcasecmp(url->protocol, "http_proxy") ) { + if( !strcasecmp(url->protocol, "mp_http_proxy") ) { mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: http://%s:%d\n", url->hostname, url->port ); return url_out; } // Check if the http_proxy environment variable is set. - if( !strcasecmp(url->protocol, "http") ) { + if( !strcasecmp(url->protocol, "mp_http") ) { char *proxy; proxy = getenv("http_proxy"); if( proxy!=NULL ) { @@ -180,9 +180,12 @@ http_send_request( URL_t *url, int64_t pos ) { http_hdr = http_new_header(); - if( !strcasecmp(url->protocol, "http_proxy") ) { + if( !strcasecmp(url->protocol, "mp_http_proxy") ) { proxy = 1; - server_url = url_new( (url->file)+1 ); + if (!strncasecmp(url->file, "/mp_", 3)) + server_url = url_new( (url->file)+4 ); + else + server_url = url_new( (url->file)+1 ); if (!server_url) { mp_msg(MSGT_NETWORK, MSGL_ERR, "Invalid URL '%s' to proxify\n", url->file+1); goto err_out; |