From 11a3589665aae1a2423e258e40eba45c117627d5 Mon Sep 17 00:00:00 2001 From: Josh Bell Date: Tue, 25 Mar 2008 19:10:33 +0000 Subject: svn merge -r 82869:83166 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release Includes: DEV-12492 "new" regAPI fails on php-framework-2 DEV-11540 Show browser HUD for A/B test users coming from SL.com. DEV-11730 LLSD parser changes PHP logs to syslog DEV-12146 php llsd_UUID does not pass the IsUUID() validation function DEV-12356 oldstyle FetchInventoryDescendents should be TEMPLATE not LLSD steve's fix to setting the proxy option in curl --- indra/llmessage/llurlrequest.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'indra/llmessage') diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index b5b45c557e..475bd7a839 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -34,7 +34,6 @@ #include "linden_common.h" #include "llurlrequest.h" -#include #include #include "llcurl.h" @@ -64,7 +63,6 @@ public: LLURLRequestDetail(); ~LLURLRequestDetail(); std::string mURL; - std::string mProxy; LLCurlEasyRequest* mCurlRequest; LLBufferArray* mResponseBuffer; LLChannelDescriptors mChannels; @@ -195,11 +193,7 @@ void LLURLRequest::useProxy(bool use_proxy) void LLURLRequest::useProxy(const std::string &proxy) { - mDetail->mProxy = proxy; - curl_easy_setopt( - mDetail->mCurlRequest, - CURLOPT_PROXY, - mDetail->mProxy.c_str()); + mDetail->mCurlRequest->setoptString(CURLOPT_PROXY, proxy); } // virtual -- cgit v1.2.3