generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Joerg Mueller-Tolk's fix to better deal with user+passwords for proxies

Browse Source
This commit is contained in:
Daniel Stenberg 2003-09-03 21:47:41 +00:00
parent 2ad0a7d20f
commit cafcc242e6
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/url.c
View File

@ -2144,18 +2144,24 @@ static CURLcode CreateConnection(struct SessionHandle *data,
if(conn->bits.proxy_user_passwd) { if(conn->bits.proxy_user_passwd) {
char proxyuser[MAX_CURL_USER_LENGTH]=""; char proxyuser[MAX_CURL_USER_LENGTH]="";
char proxypasswd[MAX_CURL_PASSWORD_LENGTH]=""; char proxypasswd[MAX_CURL_PASSWORD_LENGTH]="";
passwdgiven = FALSE;
if(*data->set.proxyuserpwd != ':') { if(*data->set.proxyuserpwd != ':') {
/* the name is given, get user+password */ /* the name is given, get user+password */
sscanf(data->set.proxyuserpwd, "%127[^:]:%127[^\n]", sscanf(data->set.proxyuserpwd, "%127[^:]:%127[^\n]",
proxyuser, proxypasswd); proxyuser, proxypasswd);
if(strchr(data->set.proxyuserpwd, ':'))
/* a colon means the password was given, even if blank */
passwdgiven = TRUE;
} }
else else {
/* no name given, get the password only */ /* no name given, get the password only */
sscanf(data->set.proxyuserpwd+1, "%127[^\n]", proxypasswd); sscanf(data->set.proxyuserpwd+1, "%127[^\n]", proxypasswd);
passwdgiven = TRUE;
}
/* check for password, if no ask for one */ /* check for password, if no ask for one */
if( !proxypasswd[0] ) { if( !proxypasswd[0] && !passwdgiven) {
if(data->set.fpasswd( data->set.passwd_client, if(data->set.fpasswd( data->set.passwd_client,
"proxy password:", "proxy password:",
proxypasswd, proxypasswd,
@ -2709,6 +2715,7 @@ static CURLcode CreateConnection(struct SessionHandle *data,
user[0] =0; /* to make everything well-defined */ user[0] =0; /* to make everything well-defined */
passwd[0]=0; passwd[0]=0;
passwdgiven = FALSE; /* none given so far */
if (conn->protocol & (PROT_FTP|PROT_HTTP)) { if (conn->protocol & (PROT_FTP|PROT_HTTP)) {
/* This is a FTP or HTTP URL, we will now try to extract the possible /* This is a FTP or HTTP URL, we will now try to extract the possible