diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-10-20 11:20:41 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-10-20 11:20:41 -0400 |
| commit | 620b63a31667d93d9186217eb355d05e71ff245c (patch) | |
| tree | 2f42a44fab44a796776a29aafdc0f298463ba292 /indra/test/llhttpclient_tut.cpp | |
| parent | 77876a3c4f18b480f9afd17be57b123d2e5f1e84 (diff) | |
Fixed test build issues caused by merging. Still encountering pthread assert after running indra/test
Diffstat (limited to 'indra/test/llhttpclient_tut.cpp')
| -rw-r--r-- | indra/test/llhttpclient_tut.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp index c5e889b860..16a73c03cb 100644 --- a/indra/test/llhttpclient_tut.cpp +++ b/indra/test/llhttpclient_tut.cpp @@ -36,6 +36,7 @@ // These are too slow on Windows to actually include in the build. JC #if !LL_WINDOWS +#include "llapr.h" #include "lltut.h" #include "llhttpclient.h" #include "llformat.h" @@ -84,9 +85,10 @@ namespace tut public: HTTPClientTestData() { + apr_pool_create(&mPool, NULL); LLCurl::initClass(false); - mServerPump = new LLPumpIO(); - mClientPump = new LLPumpIO(); + mServerPump = new LLPumpIO(mPool); + mClientPump = new LLPumpIO(mPool); LLHTTPClient::setPump(*mClientPump); } @@ -98,7 +100,7 @@ namespace tut void setupTheServer() { - LLHTTPNode& root = LLIOHTTPServer::create(*mServerPump, 8888); + LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888); LLHTTPStandardServices::useServices(); LLHTTPRegistrar::buildAllServices(root); |