diff options
| author | Linus Nielsen <linus@haxx.se> | 2015-03-29 14:52:31 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2015-04-28 08:29:56 +0200 |
| commit | 97c272e5d173ad5f706443e2477f0a84f0044edd (patch) | |
| tree | f43116c71d2dd85e4e0e62866a096e3b3bd98a37 /include | |
| parent | 54c394699de29ea9ca07d9d0ac6f2f43848e5f32 (diff) | |
| download | curl-97c272e5d173ad5f706443e2477f0a84f0044edd.tar.gz | |
Negotiate: custom service names for SPNEGO.
* Add new options, CURLOPT_PROXY_SERVICE_NAME and CURLOPT_SERVICE_NAME.
* Add new curl options, --proxy-service-name and --service-name.
Diffstat (limited to 'include')
| -rw-r--r-- | include/curl/curl.h | 6 | ||||
| -rw-r--r-- | include/curl/typecheck-gcc.h | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/curl/curl.h b/include/curl/curl.h index ae1b0e4db..9ef753140 100644 --- a/include/curl/curl.h +++ b/include/curl/curl.h @@ -1632,6 +1632,12 @@ typedef enum { /* Do not squash dot-dot sequences */ CINIT(PATH_AS_IS, LONG, 234), + /* Proxy Service Name */ + CINIT(PROXY_SERVICE_NAME, OBJECTPOINT, 235), + + /* Service Name */ + CINIT(SERVICE_NAME, OBJECTPOINT, 236), + CURLOPT_LASTENTRY /* the last unused */ } CURLoption; diff --git a/include/curl/typecheck-gcc.h b/include/curl/typecheck-gcc.h index 69d41a20d..13fb0fa9e 100644 --- a/include/curl/typecheck-gcc.h +++ b/include/curl/typecheck-gcc.h @@ -270,6 +270,8 @@ _CURL_WARNING(_curl_easy_getinfo_err_curl_slist, (option) == CURLOPT_DNS_LOCAL_IP4 || \ (option) == CURLOPT_DNS_LOCAL_IP6 || \ (option) == CURLOPT_LOGIN_OPTIONS || \ + (option) == CURLOPT_PROXY_SERVICE_NAME || \ + (option) == CURLOPT_SERVICE_NAME || \ 0) /* evaluates to true if option takes a curl_write_callback argument */ |