summaryrefslogtreecommitdiff
path: root/indra/llmessage/llurlrequest.cpp
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2008-03-03 23:35:24 +0000
committerBryan O'Sullivan <bos@lindenlab.com>2008-03-03 23:35:24 +0000
commit62d9c7f76ce4953064fbc2a778ad4ecefb918e01 (patch)
tree22713f53fbc0bba229120d99959598b6ef188cad /indra/llmessage/llurlrequest.cpp
parent1b9fb0031f4c909aa82d48151b99b6162a7ab801 (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)
Diffstat (limited to 'indra/llmessage/llurlrequest.cpp')
-rw-r--r--indra/llmessage/llurlrequest.cpp5
1 files changed, 5 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,