3f1fb9a66e
Introduces AIHTTPTimeoutPolicy objects which do not just specify a single "timeout" in seconds, but a plethora of timings related to the life cycle of the average HTTP transaction. This knowledge is that moved to the Responder being used instead of floating constants hardcoded in the callers of http requests. This assumes that the same timeout policy is wanted for each transaction that uses the same Responder, which can be enforced is needed. I added a AIHTTPTimeoutPolicy for EVERY responder, only to make it easier later to tune timeout values and/or to get feedback about which responder runs into HTTP errors in debug output (especially time outs), so that they can be tuned later. If we already understood exactly what we were doing then most responders could have been left alone and just return the default timeout policy: by far most timeout policies are just a copy of the default policy, currently. This commit is not finished... It's a work in progress (viewer runs fine with it though).
150 lines
5.4 KiB
C++
150 lines
5.4 KiB
C++
/**
|
|
* @file llcurlrequest.cpp
|
|
* @brief Implementation of Request.
|
|
*
|
|
* Copyright (c) 2012, Aleric Inglewood.
|
|
* Copyright (C) 2010, Linden Research, Inc.
|
|
*
|
|
* This program is free software: you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation, either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
*
|
|
* There are special exceptions to the terms and conditions of the GPL as
|
|
* it is applied to this Source Code. View the full text of the exception
|
|
* in the file doc/FLOSS-exception.txt in this software distribution.
|
|
*
|
|
* CHANGELOG
|
|
* and additional copyright holders.
|
|
*
|
|
* 17/03/2012
|
|
* Initial version, written by Aleric Inglewood @ SL
|
|
*
|
|
* 20/03/2012
|
|
* Added copyright notice for Linden Lab for those parts that were
|
|
* copied or derived from llcurl.cpp. The code of those parts are
|
|
* already in their own llcurl.cpp, so they do not ever need to
|
|
* even look at this file; the reason I added the copyright notice
|
|
* is to make clear that I am not the author of 100% of this code
|
|
* and hence I cannot change the license of it.
|
|
*/
|
|
|
|
#include "linden_common.h"
|
|
|
|
#include "llsdserialize.h"
|
|
#include "llcurlrequest.h"
|
|
#include "llbufferstream.h"
|
|
#include "aicurleasyrequeststatemachine.h"
|
|
#include "aihttpheaders.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// class Request
|
|
//
|
|
|
|
namespace AICurlInterface {
|
|
|
|
bool Request::get2(std::string const& url, ResponderPtr responder)
|
|
{
|
|
AIHTTPHeaders empty_headers;
|
|
return getByteRange2(url, empty_headers, 0, -1, responder);
|
|
}
|
|
|
|
bool Request::getByteRange2(std::string const& url, AIHTTPHeaders const& headers, S32 offset, S32 length, ResponderPtr responder)
|
|
{
|
|
DoutEntering(dc::curl, "Request::getByteRange(" << url << ", ...)");
|
|
|
|
// This might throw AICurlNoEasyHandle.
|
|
AICurlEasyRequestStateMachine* buffered_easy_request = new AICurlEasyRequestStateMachine(true);
|
|
|
|
{
|
|
AICurlEasyRequest_wat buffered_easy_request_w(*buffered_easy_request->mCurlEasyRequest);
|
|
|
|
AICurlResponderBuffer_wat(*buffered_easy_request->mCurlEasyRequest)->prepRequest(buffered_easy_request_w, headers, responder);
|
|
|
|
buffered_easy_request_w->setopt(CURLOPT_HTTPGET, 1);
|
|
if (length > 0)
|
|
{
|
|
std::string range = llformat("Range: bytes=%d-%d", offset, offset + length - 1);
|
|
buffered_easy_request_w->addHeader(range.c_str());
|
|
}
|
|
|
|
buffered_easy_request_w->finalizeRequest(url, responder->getHTTPTimeoutPolicy(), buffered_easy_request);
|
|
}
|
|
|
|
buffered_easy_request->run();
|
|
|
|
return true; // We throw in case of problems.
|
|
}
|
|
|
|
bool Request::post2(std::string const& url, AIHTTPHeaders const& headers, std::string const& data, ResponderPtr responder)
|
|
{
|
|
DoutEntering(dc::curl, "Request::post(" << url << ", ...)");
|
|
|
|
// This might throw AICurlNoEasyHandle.
|
|
AICurlEasyRequestStateMachine* buffered_easy_request = new AICurlEasyRequestStateMachine(true);
|
|
|
|
{
|
|
AICurlEasyRequest_wat buffered_easy_request_w(*buffered_easy_request->mCurlEasyRequest);
|
|
AICurlResponderBuffer_wat buffer_w(*buffered_easy_request->mCurlEasyRequest);
|
|
|
|
buffer_w->prepRequest(buffered_easy_request_w, headers, responder);
|
|
|
|
U32 bytes = data.size();
|
|
bool success = buffer_w->getInput()->append(buffer_w->sChannels.out(), (U8 const*)data.data(), bytes);
|
|
if (!success)
|
|
{
|
|
buffered_easy_request->kill();
|
|
throw AICurlNoBody("LLBufferArray::copyIntoBuffers() returned false");
|
|
}
|
|
buffered_easy_request_w->setPost(bytes);
|
|
buffered_easy_request_w->addHeader("Content-Type: application/octet-stream");
|
|
buffered_easy_request_w->finalizeRequest(url, responder->getHTTPTimeoutPolicy(), buffered_easy_request);
|
|
}
|
|
|
|
buffered_easy_request->run();
|
|
|
|
return true; // We throw in case of problems.
|
|
}
|
|
|
|
bool Request::post3(std::string const& url, AIHTTPHeaders const& headers, LLSD const& data, ResponderPtr responder)
|
|
{
|
|
DoutEntering(dc::curl, "Request::post(" << url << ", ...)");
|
|
|
|
// This might throw AICurlNoEasyHandle.
|
|
AICurlEasyRequestStateMachine* buffered_easy_request = new AICurlEasyRequestStateMachine(true);
|
|
|
|
{
|
|
AICurlEasyRequest_wat buffered_easy_request_w(*buffered_easy_request->mCurlEasyRequest);
|
|
AICurlResponderBuffer_wat buffer_w(*buffered_easy_request->mCurlEasyRequest);
|
|
|
|
buffer_w->prepRequest(buffered_easy_request_w, headers, responder);
|
|
|
|
LLBufferStream buffer_stream(buffer_w->sChannels, buffer_w->getInput().get());
|
|
LLSDSerialize::toXML(data, buffer_stream);
|
|
// Need to flush the LLBufferStream or countAfter() returns more than the written data.
|
|
buffer_stream << std::flush;
|
|
S32 bytes = buffer_w->getInput()->countAfter(buffer_w->sChannels.out(), NULL);
|
|
buffered_easy_request_w->setPost(bytes);
|
|
buffered_easy_request_w->addHeader("Content-Type: application/llsd+xml");
|
|
buffered_easy_request_w->finalizeRequest(url, responder->getHTTPTimeoutPolicy(), buffered_easy_request);
|
|
|
|
lldebugs << "POSTING: " << bytes << " bytes." << llendl;
|
|
}
|
|
|
|
buffered_easy_request->run();
|
|
|
|
return true; // We throw in case of problems.
|
|
}
|
|
|
|
} // namespace AICurlInterface
|
|
//==================================================================================
|
|
|