diff options
| author | Bryan O'Sullivan <bos@lindenlab.com> | 2008-03-03 23:35:24 +0000 |
|---|---|---|
| committer | Bryan O'Sullivan <bos@lindenlab.com> | 2008-03-03 23:35:24 +0000 |
| commit | 62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (patch) | |
| tree | 22713f53fbc0bba229120d99959598b6ef188cad | |
| parent | 1b9fb0031f4c909aa82d48151b99b6162a7ab801 (diff) | |
svn merge -r81155:81167 svn+ssh://svn.lindenlab.com/svn/linden/branches/dev-8000-merge-0
Allow for a seperate HTTP proxy for the LLHTTPRequest HTTP client (QAR-318)
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 5 | ||||
| -rw-r--r-- | indra/llmessage/llurlrequest.h | 5 |
2 files changed, 10 insertions, 0 deletions
diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index f850656785..db67fbeea7 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -192,6 +192,11 @@ void LLURLRequest::useProxy(bool use_proxy) } } +void LLURLRequest::useProxy(const std::string &proxy) +{ + curl_easy_setopt(mDetail->mCurlRequest, CURLOPT_PROXY, proxy.c_str()); +} + // virtual LLIOPipe::EStatus LLURLRequest::handleError( LLIOPipe::EStatus status, diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h index b154794ff1..288bf463f5 100644 --- a/indra/llmessage/llurlrequest.h +++ b/indra/llmessage/llurlrequest.h @@ -166,6 +166,11 @@ public: */ void useProxy(bool use_proxy); + /** + * @ brief Set the CURLOPT_PROXY header to the given value. + */ + void useProxy(const std::string& proxy); + public: /** * @brief Give this pipe a chance to handle a generated error |