Skip to content
Snippets Groups Projects
Commit a6c638d8 authored by Xiaohong Bao's avatar Xiaohong Bao
Browse files

more exception handlings for llcurl fixes.

parent 11bd5cb8
No related branches found
No related tags found
No related merge requests found
...@@ -111,6 +111,7 @@ class LLPumpIO ...@@ -111,6 +111,7 @@ class LLPumpIO
* @param chain The pipes for the chain * @param chain The pipes for the chain
* @param timeout The number of seconds in the future to * @param timeout The number of seconds in the future to
* expire. Pass in 0.0f to never expire. * expire. Pass in 0.0f to never expire.
* @param has_curl_request The chain contains LLURLRequest if true.
* @return Returns true if anything was added to the pump. * @return Returns true if anything was added to the pump.
*/ */
bool addChain(const chain_t& chain, F32 timeout, bool has_curl_request = false); bool addChain(const chain_t& chain, F32 timeout, bool has_curl_request = false);
......
...@@ -239,12 +239,17 @@ class LLSDRPCClientFactory : public LLChainIOFactory ...@@ -239,12 +239,17 @@ class LLSDRPCClientFactory : public LLChainIOFactory
LLSDRPCClientFactory(const std::string& fixed_url) : mURL(fixed_url) {} LLSDRPCClientFactory(const std::string& fixed_url) : mURL(fixed_url) {}
virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const
{ {
llerrs << "Can not call this." << llendl ;
lldebugs << "LLSDRPCClientFactory::build" << llendl; lldebugs << "LLSDRPCClientFactory::build" << llendl;
LLIOPipe::ptr_t service(new Client);
chain.push_back(service);
LLURLRequest* http(new LLURLRequest(LLURLRequest::HTTP_POST)); LLURLRequest* http(new LLURLRequest(LLURLRequest::HTTP_POST));
if(!http->isValid())
{
llwarns << "Creating LLURLRequest failed." << llendl ;
delete http;
return false;
}
LLIOPipe::ptr_t service(new Client);
chain.push_back(service);
LLIOPipe::ptr_t http_pipe(http); LLIOPipe::ptr_t http_pipe(http);
http->addHeader("Content-Type: text/llsd"); http->addHeader("Content-Type: text/llsd");
if(mURL.empty()) if(mURL.empty())
...@@ -284,11 +289,17 @@ class LLXMLSDRPCClientFactory : public LLChainIOFactory ...@@ -284,11 +289,17 @@ class LLXMLSDRPCClientFactory : public LLChainIOFactory
LLXMLSDRPCClientFactory(const std::string& fixed_url) : mURL(fixed_url) {} LLXMLSDRPCClientFactory(const std::string& fixed_url) : mURL(fixed_url) {}
virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const virtual bool build(LLPumpIO::chain_t& chain, LLSD context) const
{ {
llerrs << "who calls this?" << llendl ;
lldebugs << "LLXMLSDRPCClientFactory::build" << llendl; lldebugs << "LLXMLSDRPCClientFactory::build" << llendl;
LLIOPipe::ptr_t service(new Client);
chain.push_back(service);
LLURLRequest* http(new LLURLRequest(LLURLRequest::HTTP_POST)); LLURLRequest* http(new LLURLRequest(LLURLRequest::HTTP_POST));
if(!http->isValid())
{
llwarns << "Creating LLURLRequest failed." << llendl ;
delete http;
return false ;
}
LLIOPipe::ptr_t service(new Client);
chain.push_back(service);
LLIOPipe::ptr_t http_pipe(http); LLIOPipe::ptr_t http_pipe(http);
http->addHeader("Content-Type: text/xml"); http->addHeader("Content-Type: text/xml");
if(mURL.empty()) if(mURL.empty())
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment