Merge of QAR-1267 to trunk. This was a combo merge of QAR-1175 (maint-render-9) and QAR-1236 (dll-msvcrt-2)

svn merge -r 109838:112264 svn+ssh://svn.lindenlab.com/svn/linden/branches/maint-render/maint-render-9-merge-r109833

1 files changed, 4 insertions, 6 deletions

diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp
index 6ef97bea58..46e976fe35 100644
--- a/indra/llmessage/llurlrequest.cpp
+++ b/indra/llmessage/llurlrequest.cpp
@@ -44,7 +44,7 @@
 #include "llsd.h"
 #include "llstring.h"
 #include "apr_env.h"
-
+#include "llapr.h"
 static const U32 HTTP_STATUS_PIPE_ERROR = 499;
 
 /**
@@ -166,18 +166,16 @@ void LLURLRequest::useProxy(bool use_proxy)
     if (use_proxy && (env_proxy == NULL))
     {
         apr_status_t status;
-        apr_pool_t* pool;
-        apr_pool_create(&pool, NULL);
-        status = apr_env_get(&env_proxy, "ALL_PROXY", pool);
+        LLAPRPool pool;
+		status = apr_env_get(&env_proxy, "ALL_PROXY", pool.getAPRPool());
         if (status != APR_SUCCESS)
         {
-            status = apr_env_get(&env_proxy, "http_proxy", pool);
+			status = apr_env_get(&env_proxy, "http_proxy", pool.getAPRPool());
         }
         if (status != APR_SUCCESS)
         {
            use_proxy = FALSE;
         }
-        apr_pool_destroy(pool);
     }