From 788c787ea7bb80d1a9b29f210d9af9f4da5d4cdb Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Fri, 11 Jun 2010 18:56:18 -0700 Subject: Upgraded windows libcurl to 7.20.1 and c-ares to 1.7.1 for consistency with mac/linux and potentially improve EXT-7032 behavior. --- indra/llmessage/llares.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'indra/llmessage/llares.cpp') diff --git a/indra/llmessage/llares.cpp b/indra/llmessage/llares.cpp index 00e77d20e9..78561b37aa 100644 --- a/indra/llmessage/llares.cpp +++ b/indra/llmessage/llares.cpp @@ -473,7 +473,7 @@ bool LLAres::process(U64 timeout) ll_init_apr(); } - int socks[ARES_GETSOCK_MAXNUM]; + ares_socket_t socks[ARES_GETSOCK_MAXNUM]; apr_pollfd_t aprFds[ARES_GETSOCK_MAXNUM]; apr_int32_t nsds = 0; int nactive = 0; -- cgit v1.2.3 From dc446700e3bf41ddb93602013285177996b66bd5 Mon Sep 17 00:00:00 2001 From: brad kittenbrink Date: Mon, 14 Jun 2010 14:30:34 -0700 Subject: FIX EXT-7857 - c-ares library initialization was skipping a new step. --- indra/llmessage/llares.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'indra/llmessage/llares.cpp') 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() -- cgit v1.2.3