diff options
| author | brad kittenbrink <brad@lindenlab.com> | 2010-06-11 18:56:18 -0700 |
|---|---|---|
| committer | brad kittenbrink <brad@lindenlab.com> | 2010-06-11 18:56:18 -0700 |
| commit | 788c787ea7bb80d1a9b29f210d9af9f4da5d4cdb (patch) | |
| tree | 642b3c66525f20fdfb2f2ffd4ab782188b43832f | |
| parent | 5bf8c727c73c98310496be63e9c67a8124e80afe (diff) | |
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.
| -rw-r--r-- | indra/cmake/CARes.cmake | 1 | ||||
| -rw-r--r-- | indra/llmessage/llares.cpp | 2 | ||||
| -rw-r--r-- | install.xml | 8 |
3 files changed, 6 insertions, 5 deletions
diff --git a/indra/cmake/CARes.cmake b/indra/cmake/CARes.cmake index 8a2dc01561..1850b706ac 100644 --- a/indra/cmake/CARes.cmake +++ b/indra/cmake/CARes.cmake @@ -9,6 +9,7 @@ if (STANDALONE) include(FindCARes) else (STANDALONE) use_prebuilt_binary(ares) + add_definitions("-DCARES_STATICLIB") if (WINDOWS) set(CARES_LIBRARIES areslib) elseif (DARWIN) 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; diff --git a/install.xml b/install.xml index eeea250171..1f3e74a27a 100644 --- a/install.xml +++ b/install.xml @@ -132,9 +132,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>f5cf8d121b26f2e7944f7e63cdbff04d</string> + <string>4b84738eec2e21b0c096d53b79ee2681</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.6.0-windows-20091105.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/ares-1.7.1-windows-20100611a.tar.bz2</uri> </map> </map> </map> @@ -254,9 +254,9 @@ <key>windows</key> <map> <key>md5sum</key> - <string>78ccac8aaf8ea5bec482dfbcdbeb1651</string> + <string>b28856d3d02ee680353ae440561a6579</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.19.6-windows-20100414.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/curl-7.20.1-windows-20100611.tar.bz2</uri> </map> </map> </map> |