From 620b63a31667d93d9186217eb355d05e71ff245c Mon Sep 17 00:00:00 2001 From: Logan Dethrow Date: Thu, 20 Oct 2011 11:20:41 -0400 Subject: Fixed test build issues caused by merging. Still encountering pthread assert after running indra/test --- indra/test/llhttpclient_tut.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'indra/test/llhttpclient_tut.cpp') 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); -- cgit v1.2.3