diff options
| author | cboesch <cboesch@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2010-12-03 23:10:36 +0000 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-12-16 05:19:17 +0200 |
| commit | 1737297b581eca0ebcb7a399253771450cc24176 (patch) | |
| tree | 77ac3a89101319331bee9d35f5bff7ef574bfb6a /stream/network.c | |
| parent | db522b94e05ba42ebe1ec489d9a61b2e254a9c84 (diff) | |
| download | mpv-1737297b581eca0ebcb7a399253771450cc24176.tar.bz2 mpv-1737297b581eca0ebcb7a399253771450cc24176.tar.xz | |
stream/http: Add support for login/password in http_proxy env variable
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32673 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/network.c')
| -rw-r--r-- | stream/network.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/network.c b/stream/network.c index c8667686ec..c6776ac29a 100644 --- a/stream/network.c +++ b/stream/network.c @@ -165,14 +165,14 @@ check4proxies( URL_t *url ) { #endif mp_msg(MSGT_NETWORK,MSGL_V,"Using HTTP proxy: %s\n", proxy_url->url ); - len = strlen( proxy_url->hostname ) + strlen( url->url ) + 20; // 20 = http_proxy:// + port - new_url = malloc( len+1 ); + len = make_http_proxy_url(proxy_url, url->url, NULL, 0) + 1; + new_url = malloc(len); if( new_url==NULL ) { mp_tmsg(MSGT_NETWORK,MSGL_FATAL,"Memory allocation failed.\n"); url_free(proxy_url); return url_out; } - sprintf(new_url, "http_proxy://%s:%d/%s", proxy_url->hostname, proxy_url->port, url->url ); + make_http_proxy_url(proxy_url, url->url, new_url, len); tmp_url = url_new( new_url ); if( tmp_url==NULL ) { free( new_url ); |