From 11a3589665aae1a2423e258e40eba45c117627d5 Mon Sep 17 00:00:00 2001
From: Josh Bell <josh@lindenlab.com>
Date: Tue, 25 Mar 2008 19:10:33 +0000
Subject: [PATCH] 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
---
etc/message.xml | 2 +-
indra/llcommon/llversionserver.h | 2 +-
indra/llmessage/llurlrequest.cpp | 8 +-------
3 files changed, 3 insertions(+), 9 deletions(-)
diff --git a/etc/message.xml b/etc/message.xml
index c6875cdcc9..331e6bb251 100644
--- a/etc/message.xml
+++ b/etc/message.xml
@@ -445,7 +445,7 @@
<key>FetchInventoryDescendents</key>
<map>
<key>flavor</key>
- <string>llsd</string>
+ <string>template</string>
<key>trusted-sender</key>
<boolean>false</boolean>
</map>
diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h
index 054d8fc896..04f7821f64 100644
--- a/indra/llcommon/llversionserver.h
+++ b/indra/llcommon/llversionserver.h
@@ -35,7 +35,7 @@
const S32 LL_VERSION_MAJOR = 1;
const S32 LL_VERSION_MINOR = 19;
const S32 LL_VERSION_PATCH = 2;
-const S32 LL_VERSION_BUILD = 82393;
+const S32 LL_VERSION_BUILD = 82965;
const char * const LL_CHANNEL = "Second Life Server";
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 <curl/curl.h>
#include <algorithm>
#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
--
GitLab