diff options
Diffstat (limited to 'indra/test')
| -rw-r--r-- | indra/test/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | indra/test/llhttpclient_tut.cpp | 10 | 
2 files changed, 5 insertions, 7 deletions
| diff --git a/indra/test/CMakeLists.txt b/indra/test/CMakeLists.txt index 86cf153610..45c6130bd5 100644 --- a/indra/test/CMakeLists.txt +++ b/indra/test/CMakeLists.txt @@ -38,7 +38,7 @@ set(test_SOURCE_FILES      lldoubledispatch_tut.cpp      llevents_tut.cpp      llhttpdate_tut.cpp -#    llhttpclient_tut.cpp               # Segfaults, disabled. +    llhttpclient_tut.cpp      llhttpnode_tut.cpp      lliohttpserver_tut.cpp      llmessageconfig_tut.cpp diff --git a/indra/test/llhttpclient_tut.cpp b/indra/test/llhttpclient_tut.cpp index 03759001ae..c5e889b860 100644 --- a/indra/test/llhttpclient_tut.cpp +++ b/indra/test/llhttpclient_tut.cpp @@ -84,10 +84,9 @@ namespace tut  	public:  		HTTPClientTestData()  		{ -			apr_pool_create(&mPool, NULL); -			mServerPump = new LLPumpIO(mPool); -			mClientPump = new LLPumpIO(mPool); -			 +			LLCurl::initClass(false); +			mServerPump = new LLPumpIO(); +			mClientPump = new LLPumpIO();  			LLHTTPClient::setPump(*mClientPump);  		} @@ -95,12 +94,11 @@ namespace tut  		{  			delete mServerPump;  			delete mClientPump; -			apr_pool_destroy(mPool);  		}  		void setupTheServer()  		{ -			LLHTTPNode& root = LLIOHTTPServer::create(mPool, *mServerPump, 8888); +			LLHTTPNode& root = LLIOHTTPServer::create(*mServerPump, 8888);  			LLHTTPStandardServices::useServices();  			LLHTTPRegistrar::buildAllServices(root); | 
