Merge from default branch

--HG--
branch : product-engine

2 files changed, 4 insertions, 1 deletions

diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp
index 78561b37aa..5b7e5138ef 100644
--- a/indra/llmessage/llares.cpp
+++ b/indra/llmessage/llares.cpp
@@ -108,7 +108,8 @@ LLAres::LLAres() :
     mInitSuccess(false),
     mListener(new LLAresListener(this))
 {
-	if (ares_init(&chan_) != ARES_SUCCESS)
+	if (ares_library_init( ARES_LIB_INIT_ALL ) != ARES_SUCCESS ||
+		ares_init(&chan_) != ARES_SUCCESS)
 	{
 		llwarns << "Could not succesfully initialize ares!" << llendl;
 		return;
@@ -120,6 +121,7 @@ LLAres::LLAres() :
 LLAres::~LLAres()
 {
 	ares_destroy(chan_);
+	ares_library_cleanup();
 }
 
 void LLAres::cancel()
diff --git a/indra/llmessage/llhttpclient.cpp b/indra/llmessage/llhttpclient.cpp
index 9c2e4b5658..e8dc207114 100644
--- a/indra/llmessage/llhttpclient.cpp
+++ b/indra/llmessage/llhttpclient.cpp
@@ -199,6 +199,7 @@ namespace
 			fileBuffer = new U8 [fileSize];
             vfile.read(fileBuffer, fileSize);
             ostream.write((char*)fileBuffer, fileSize);
+			delete [] fileBuffer;
 			eos = true;
 			return STATUS_DONE;
 		}