diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-03-21 01:28:52 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-03-21 01:28:52 +0000 |
| commit | 9fd4dfa5727b9c971b53d73ff273d3a43cc1f3f4 (patch) | |
| tree | 48b2cca442e006bddc0d73f68414331eee79cae4 | |
| parent | e3b97ac65b10a58c1dac041743e4acd1042492f5 (diff) | |
svn merge -r 82563:82869 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-2-Server --> release
DEV-12326 DEV-12232 fix for strange string crashes.
web dataservices: fixed issue with non-selects not returning affected rows, also cleaned up log messages and unit tests
DEV-12232 fix for crash bug.
DEV-12105 Setting a music URL which is too long creates many problems
Adding streambase log message for login failures.
Changed URL for FetchInventoryDescendents to use new webservice when we're ready.
DEV-12140 - Mapserver crashes in 1.19.2 Server
QAR-390 - Add log_viewer_stats syslog writes
need to deploy vault_control.pl central services, for reg
DEV-11104 - Don't chew up memory profiling everything in pay-stipends.pl
web dataservices: minor changes: logging added, mailer host changed to localhost per Ops
| -rw-r--r-- | etc/message.xml | 2 | ||||
| -rw-r--r-- | indra/llmessage/llurlrequest.cpp | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/etc/message.xml b/etc/message.xml index af3db1d9ad..c6875cdcc9 100644 --- a/etc/message.xml +++ b/etc/message.xml @@ -537,7 +537,7 @@ <boolean>false</boolean> <key>EstateChangeInfo</key> - <boolean>false</boolean> + <boolean>true</boolean> <key>FetchInventoryDescendents</key> <boolean>true</boolean> diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index db67fbeea7..b5b45c557e 100644 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -64,6 +64,7 @@ public: LLURLRequestDetail(); ~LLURLRequestDetail(); std::string mURL; + std::string mProxy; LLCurlEasyRequest* mCurlRequest; LLBufferArray* mResponseBuffer; LLChannelDescriptors mChannels; @@ -194,7 +195,11 @@ void LLURLRequest::useProxy(bool use_proxy) void LLURLRequest::useProxy(const std::string &proxy) { - curl_easy_setopt(mDetail->mCurlRequest, CURLOPT_PROXY, proxy.c_str()); + mDetail->mProxy = proxy; + curl_easy_setopt( + mDetail->mCurlRequest, + CURLOPT_PROXY, + mDetail->mProxy.c_str()); } // virtual |