diff options
| author | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-11-13 16:39:06 (GMT) |
|---|---|---|
| committer | Stefan Radomski <radomski@tk.informatik.tu-darmstadt.de> | 2014-11-13 16:39:06 (GMT) |
| commit | 2bc6ae32bbb67d242436d173c41fabc47626b943 (patch) | |
| tree | e520464ce501de8f01b9564307041e6336731f1e | |
| parent | afec6e2f8bd472da1d9170bdaf102b5a572bcd2a (diff) | |
| download | uscxml-2bc6ae32bbb67d242436d173c41fabc47626b943.zip uscxml-2bc6ae32bbb67d242436d173c41fabc47626b943.tar.gz uscxml-2bc6ae32bbb67d242436d173c41fabc47626b943.tar.bz2 | |
Remove CURLOPT_PROXYHEADER from supported variables as is appeared rather late in curl
| -rw-r--r-- | src/uscxml/URL.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/uscxml/URL.cpp b/src/uscxml/URL.cpp index 06fd934..8fa80c5 100644 --- a/src/uscxml/URL.cpp +++ b/src/uscxml/URL.cpp @@ -559,10 +559,10 @@ URLFetcher::URLFetcher() { // exposed just in case char* envProxyTransferMode = getenv("USCXML_PROXY_TRANSFER_MODE"); char* envProxyAuth = getenv("USCXML_PROXYAUTH"); - char* envProxyHeader = getenv("USCXML_PROXYHEADER"); // unsupported below +// char* envProxyHeader = getenv("USCXML_PROXYHEADER"); char* envProxyPassword = getenv("USCXML_PROXYPASSWORD"); char* envProxyPort = getenv("USCXML_PROXYPORT"); - char* envProxyType = getenv("USCXML_PROXYTYPE"); // unsupported below +// char* envProxyType = getenv("USCXML_PROXYTYPE"); char* envProxyUsername = getenv("USCXML_PROXYUSERNAME"); char* envProxyUserPwd = getenv("USCXML_PROXYUSERPWD"); @@ -583,11 +583,13 @@ URLFetcher::URLFetcher() { (curlError = curl_easy_setopt(_multiHandle, CURLOPT_PROXYAUTH, envProxyAuth)) == CURLE_OK || LOG(ERROR) << "Cannot set curl proxy authentication: " << curl_easy_strerror(curlError); +#if 0 /* This points to a linked list of headers used for proxy requests only, struct curl_slist kind */ if (envProxyHeader && unsupported) (curlError = curl_easy_setopt(_multiHandle, CURLOPT_PROXYHEADER, envProxyHeader)) == CURLE_OK || LOG(ERROR) << "Cannot set curl proxy header: " << curl_easy_strerror(curlError); +#endif /* "name" and "pwd" to use with Proxy when fetching. */ if (envProxyUsername) @@ -603,11 +605,13 @@ URLFetcher::URLFetcher() { (curlError = curl_easy_setopt(_multiHandle, CURLOPT_PROXYPORT, envProxyPort)) == CURLE_OK || LOG(ERROR) << "Cannot set curl proxy port: " << curl_easy_strerror(curlError); +#if 0 /* indicates type of proxy. accepted values are CURLPROXY_HTTP (default), CURLPROXY_SOCKS4, CURLPROXY_SOCKS4A and CURLPROXY_SOCKS5. */ if (envProxyType && unsupported) (curlError = curl_easy_setopt(_multiHandle, CURLOPT_PROXYTYPE, envProxyType)) == CURLE_OK || LOG(ERROR) << "Cannot set curl proxy type: " << curl_easy_strerror(curlError); +#endif /* "user:password" to use with proxy. */ if (envProxyUserPwd) |