diff options
| author | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
|---|---|---|
| committer | Leslie Linden <leslie@lindenlab.com> | 2011-09-07 13:58:19 -0700 |
| commit | 78821c51a1f7d5fcc6e4a2678bfd3446ccfaee36 (patch) | |
| tree | 51da53114f257ca57c2aa36da655019b75cf0269 /indra/llmessage/llhttpclient.cpp | |
| parent | c64bd7d5cb28fc221716e866ff9c9a28c22e69ce (diff) | |
| parent | fef401a1768bae9bfb23a13549fa3a5005f2c7ae (diff) | |
Merge from viewer-experience
Diffstat (limited to 'indra/llmessage/llhttpclient.cpp')
| -rw-r--r-- | indra/llmessage/llhttpclient.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp index 0e5206a520..dd4e3a6300 100644 --- a/indra/llmessage/llhttpclient.cpp +++ b/indra/llmessage/llhttpclient.cpp @@ -428,6 +428,9 @@ static LLSD blocking_request( std::string body_str; // other request method checks root cert first, we skip? + + // Apply configured proxy settings + LLProxy::getInstance()->applyProxySettings(curlp); // * Set curl handle options curl_easy_setopt(curlp, CURLOPT_NOSIGNAL, 1); // don't use SIGALRM for timeouts @@ -436,7 +439,7 @@ static LLSD blocking_request( curl_easy_setopt(curlp, CURLOPT_WRITEDATA, &http_buffer); curl_easy_setopt(curlp, CURLOPT_URL, url.c_str()); curl_easy_setopt(curlp, CURLOPT_ERRORBUFFER, curl_error_buffer); - + // * Setup headers (don't forget to free them after the call!) curl_slist* headers_list = NULL; if (headers.isMap()) |