diff options
| author | Leyla Farazha <leyla@lindenlab.com> | 2010-06-14 10:55:25 -0700 |
|---|---|---|
| committer | Leyla Farazha <leyla@lindenlab.com> | 2010-06-14 10:55:25 -0700 |
| commit | baf9b3cb078c04b019fccc4ae8a54db05b14bdef (patch) | |
| tree | aa422043ec900036716d35e73240efc9df152d32 /indra/llmessage | |
| parent | 76cf9e29a77566c10da6184833fad6b0912e9688 (diff) | |
| parent | fbc95fe7e77ed093f8f7938a4755ce6b175dcaff (diff) | |
Merge
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llares.cpp | 2 | ||||
| -rw-r--r-- | indra/llmessage/llhttpclient.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
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/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; } |