diff options
| author | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-29 10:36:48 -0400 |
|---|---|---|
| committer | Brad Payne (Vir Linden) <vir@lindenlab.com> | 2011-08-29 10:36:48 -0400 |
| commit | f054d44f9e2e0d152b1a0167b007eb10105487d6 (patch) | |
| tree | 3cf567add6e532f212192a6c94bfaf17c7eecc76 /indra/llmessage/llhttpclient.cpp | |
| parent | 2e4dcca9e2049aa4a8c29820937b6a956d75e5d8 (diff) | |
| parent | d45995b80d6d90aad6714adf3237dc44589169ea (diff) | |
merg
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()) |