diff -ur original/curl-7.19.1/docs/libcurl/curl_easy_setopt.3 fix_colon_in_username/curl-7.19.1/docs/libcurl/curl_easy_setopt.3 --- original/curl-7.19.1/docs/libcurl/curl_easy_setopt.3 2008-10-10 04:00:04.000000000 +0200 +++ fix_colon_in_username/curl-7.19.1/docs/libcurl/curl_easy_setopt.3 2008-10-12 13:06:49.188765600 +0200 @@ -620,6 +620,26 @@ The CURLOPT_PASSWORD option should be used in conjunction with as the \fICURLOPT_USERNAME\fP option. (Added in 7.19.1) +.IP CURLOPT_PROXYUSERNAME +Pass a char * as parameter, which should be pointing to the zero terminated +user name to use for the transfer while connecting to Proxy. + +The CURLOPT_PROXYUSERNAME option should be used in same way as the +\fICURLOPT_PROXYUSERPWD\fP is used. In comparison to \fICURLOPT_PROXYUSERPWD\fP +the CURLOPT_PROXYUSERNAME allows the username to contain colon, +like in following example: "sip:user@example.com". +Note the CURLOPT_PROXYUSERNAME option is an alternative way to set the user name +while connecting to Proxy. There is no meaning to use it together +with the \fICURLOPT_PROXYUSERPWD\fP option. + +In order to specify the password to be used in conjunction with the user name +use the \fICURLOPT_PROXYPASSWORD\fP option. (Added in 7.19.1) +.IP CURLOPT_PROXYPASSWORD +Pass a char * as parameter, which should be pointing to the zero terminated +password to use for the transfer while connecting to Proxy. + +The CURLOPT_PROXYPASSWORD option should be used in conjunction with +as the \fICURLOPT_PROXYUSERNAME\fP option. (Added in 7.19.1) .IP CURLOPT_HTTPAUTH Pass a long as parameter, which is set to a bitmask, to tell libcurl what authentication method(s) you want it to use. The available bits are listed diff -ur original/curl-7.19.1/include/curl/curl.h fix_colon_in_username/curl-7.19.1/include/curl/curl.h --- original/curl-7.19.1/include/curl/curl.h 2008-10-09 04:00:04.000000000 +0200 +++ fix_colon_in_username/curl-7.19.1/include/curl/curl.h 2008-10-12 11:25:07.619355500 +0200 @@ -1144,6 +1144,10 @@ /* "name" and "pwd" to use when fetching. */ CINIT(USERNAME, OBJECTPOINT, 173), CINIT(PASSWORD, OBJECTPOINT, 174), + + /* "name" and "pwd" to use with Proxy when fetching. */ + CINIT(PROXYUSERNAME, OBJECTPOINT, 175), + CINIT(PROXYPASSWORD, OBJECTPOINT, 176), CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff -ur original/curl-7.19.1/include/curl/typecheck-gcc.h fix_colon_in_username/curl-7.19.1/include/curl/typecheck-gcc.h --- original/curl-7.19.1/include/curl/typecheck-gcc.h 2008-10-09 04:00:04.000000000 +0200 +++ fix_colon_in_username/curl-7.19.1/include/curl/typecheck-gcc.h 2008-10-12 11:24:36.836334900 +0200 @@ -198,7 +198,9 @@ (option) == CURLOPT_USERPWD || \ (option) == CURLOPT_USERNAME || \ (option) == CURLOPT_PASSWORD || \ - (option) == CURLOPT_PROXYUSERPWD || \ + (option) == CURLOPT_PROXYUSERPWD || \ + (option) == CURLOPT_PROXYUSERNAME || \ + (option) == CURLOPT_PROXYPASSWORD || \ (option) == CURLOPT_ENCODING || \ (option) == CURLOPT_REFERER || \ (option) == CURLOPT_USERAGENT || \ Only in fix_colon_in_username/curl-7.19.1/lib: LIB-Release diff -ur original/curl-7.19.1/lib/url.c fix_colon_in_username/curl-7.19.1/lib/url.c --- original/curl-7.19.1/lib/url.c 2008-10-11 04:00:08.000000000 +0200 +++ fix_colon_in_username/curl-7.19.1/lib/url.c 2008-10-12 11:48:10.044751300 +0200 @@ -280,6 +280,38 @@ return CURLE_OK; } +static CURLcode setstropt_userpwd(char *option, char **user_storage, char **pwd_storage) +{ + char* separator; + CURLcode result = CURLE_OK; + + separator = strchr(option, ':'); + if (separator != NULL) { + + /* store username part of option */ + char * p; + size_t username_len = (size_t)(separator-option); + p = malloc(username_len+1); + if(!p) + result = CURLE_OUT_OF_MEMORY; + else { + memcpy(p, option, username_len); + p[username_len] = '\0'; + Curl_safefree(*user_storage); + *user_storage = p; + } + + /* store password part of option */ + if (result == CURLE_OK) { + result = setstropt(pwd_storage, separator+1); + } + } + else { + result = setstropt(user_storage, option); + } + return result; +} + CURLcode Curl_dupset(struct SessionHandle * dst, struct SessionHandle * src) { CURLcode r = CURLE_OK; @@ -1500,40 +1532,9 @@ /* * user:password to use in the operation */ - { - char* userpwd; - char* separator; - - userpwd = va_arg(param, char *); - if(userpwd == NULL) - break; - - separator = strchr(userpwd, ':'); - if (separator != NULL) { - - /* store username part of option */ - char * p; - size_t username_len = (size_t)(separator-userpwd); - p = malloc(username_len+1); - if(!p) - result = CURLE_OUT_OF_MEMORY; - else { - memcpy(p, userpwd, username_len); - p[username_len] = '\0'; - Curl_safefree(data->set.str[STRING_USERNAME]); - data->set.str[STRING_USERNAME] = p; - } - - /* store password part of option */ - if (result == CURLE_OK) { - result = setstropt(&data->set.str[STRING_PASSWORD], separator+1); - } - } - else { - result = setstropt(&data->set.str[STRING_USERNAME], userpwd); - } - } - break; + result = setstropt_userpwd(va_arg(param, char *), + &data->set.str[STRING_USERNAME], &data->set.str[STRING_PASSWORD]); + break; case CURLOPT_USERNAME: /* * authentication user name to use in the operation @@ -1587,9 +1588,23 @@ /* * user:password needed to use the proxy */ - result = setstropt(&data->set.str[STRING_PROXYUSERPWD], - va_arg(param, char *)); - break; + result = setstropt_userpwd(va_arg(param, char *), + &data->set.str[STRING_PROXYUSERNAME], &data->set.str[STRING_PROXYPASSWORD]); + break; + case CURLOPT_PROXYUSERNAME: + /* + * authentication user name to use in the operation + */ + result = setstropt(&data->set.str[STRING_PROXYUSERNAME], + va_arg(param, char *)); + break; + case CURLOPT_PROXYPASSWORD: + /* + * authentication password to use in the operation + */ + result = setstropt(&data->set.str[STRING_PROXYPASSWORD], + va_arg(param, char *)); + break; case CURLOPT_RANGE: /* * What range of the file you want to transfer @@ -3545,11 +3560,15 @@ char proxyuser[MAX_CURL_USER_LENGTH]=""; char proxypasswd[MAX_CURL_PASSWORD_LENGTH]=""; - sscanf(data->set.str[STRING_PROXYUSERPWD], - "%" MAX_CURL_USER_LENGTH_TXT "[^:]:" - "%" MAX_CURL_PASSWORD_LENGTH_TXT "[^\n]", - proxyuser, proxypasswd); - + if(data->set.str[STRING_PROXYUSERNAME] != NULL) { + strncpy(proxyuser, data->set.str[STRING_PROXYUSERNAME], MAX_CURL_USER_LENGTH); + proxyuser[MAX_CURL_USER_LENGTH-1] = '\0'; /*To be on safe side*/ + } + if(data->set.str[STRING_PROXYPASSWORD] != NULL) { + strncpy(proxypasswd, data->set.str[STRING_PROXYPASSWORD], MAX_CURL_PASSWORD_LENGTH); + proxypasswd[MAX_CURL_PASSWORD_LENGTH-1] = '\0'; /*To be on safe side*/ + } + conn->proxyuser = curl_easy_unescape(data, proxyuser, 0, NULL); if(!conn->proxyuser) return CURLE_OUT_OF_MEMORY; @@ -4032,7 +4051,7 @@ conn->bits.user_passwd = (bool)(NULL != data->set.str[STRING_USERNAME]); - conn->bits.proxy_user_passwd = (bool)(NULL != data->set.str[STRING_PROXYUSERPWD]); + conn->bits.proxy_user_passwd = (bool)(NULL != data->set.str[STRING_PROXYUSERNAME]); conn->bits.tunnel_proxy = data->set.tunnel_thru_httpproxy; conn->bits.ftp_use_epsv = data->set.ftp_use_epsv; conn->bits.ftp_use_eprt = data->set.ftp_use_eprt; diff -ur original/curl-7.19.1/lib/urldata.h fix_colon_in_username/curl-7.19.1/lib/urldata.h --- original/curl-7.19.1/lib/urldata.h 2008-10-09 04:00:04.000000000 +0200 +++ fix_colon_in_username/curl-7.19.1/lib/urldata.h 2008-10-12 11:20:17.213099200 +0200 @@ -1322,7 +1322,6 @@ $HOME/.netrc */ STRING_COPYPOSTFIELDS, /* if POST, set the fields' values here */ STRING_PROXY, /* proxy to use */ - STRING_PROXYUSERPWD, /* Proxy , if used */ STRING_SET_RANGE, /* range, if used */ STRING_SET_REFERER, /* custom string for the HTTP referer field */ STRING_SET_URL, /* what original URL to work on */ @@ -1339,6 +1338,8 @@ STRING_SSL_ISSUERCERT, /* issuer cert file to check certificate */ STRING_USERNAME, /* , if used */ STRING_PASSWORD, /* , if used */ + STRING_PROXYUSERNAME, /* Proxy , if used */ + STRING_PROXYPASSWORD, /* Proxy , if used */ /* -- end of strings -- */ STRING_LAST /* not used, just an end-of-list marker */