RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

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
This commit is contained in:
cboesch 2010-12-03 23:10:36 +00:00 committed by Uoti Urpala
parent db522b94e0
commit 1737297b58
3 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
stream/network.c
View File

@ -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 );

13
stream/url.c
View File

@ -67,6 +67,19 @@ static int make_noauth_url(URL_t *url, char *dst, int dst_size)
url->hostname, url->file);
}
int make_http_proxy_url(URL_t *proxy, const char *host_url, char *dst,
int dst_size)
{
if (proxy->username)
return snprintf(dst, dst_size, "http_proxy://%s:%s@%s:%d/%s",
proxy->username,
proxy->password ? proxy->password : "",
proxy->hostname, proxy->port, host_url);
else
return snprintf(dst, dst_size, "http_proxy://%s:%d/%s",
proxy->hostname, proxy->port, host_url);
}
URL_t*
url_new(const char* url) {
int pos1, pos2,v6addr = 0, noauth_len;

3
stream/url.h
View File

@ -37,6 +37,9 @@ typedef struct {
} URL_t;
URL_t *url_redirect(URL_t **url, const char *redir);
int make_http_proxy_url(URL_t *proxy, const char *host_url, char *dst, int dst_size);
URL_t* url_new(const char* url);
void url_free(URL_t* url);