summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2008-10-16 20:21:22 +0000
committerDaniel Stenberg <daniel@haxx.se>2008-10-16 20:21:22 +0000
commita9a4300a367a4beeef0674240e6721d68f1b1ae3 (patch)
tree9d00fc2acae45e420f322395e4f4e22df6e24138 /include
parentf720e0ac0f1c9db0bbfbfe441a9983427ebb2429 (diff)
downloadcurl-a9a4300a367a4beeef0674240e6721d68f1b1ae3.tar.gz
- Igor Novoseltsev added CURLOPT_PROXYUSER and CURLOPT_PROXYPASSWORD that then
make CURLOPT_PROXYUSERPWD sort of deprecated. The primary motive for adding these new options is that they have no problems with the colon separator that the CURLOPT_PROXYUSERPWD option does.
Diffstat (limited to 'include')
-rw-r--r--include/curl/curl.h4
-rw-r--r--include/curl/typecheck-gcc.h4
2 files changed, 7 insertions, 1 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h
index 7a0960f03..0d4fdbbb2 100644
--- a/include/curl/curl.h
+++ b/include/curl/curl.h
@@ -1144,6 +1144,10 @@ typedef enum {
/* "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 --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h
index 33e264771..6f5313f1f 100644
--- a/include/curl/typecheck-gcc.h
+++ b/include/curl/typecheck-gcc.h
@@ -198,7 +198,9 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist,
(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 || \