304fa05094
For POST and PUT, libcurl adds by default a "Expect: 100-continue" header and wait for the server to reply with a 100 response. However, since the server never does that (LL comment in the code "I'm not sure what it means") it's up to libcurl to continue anyway after a while and that part is apparently bugged, causing people not to be able to login sometimes. But suppressing the header, libcurl doesn't wait for it and we worked around this bug. The commit introduces a much improved CurlEasyRequest::setPost method that enforces the above for POST, but that also no longer uses CURLOPT_COPYPOSTFIELDS (but CURLOPT_POSTFIELDS), no longer making a copy of the body of what we are going to send to the server. Instead it uses a new object, derived from AIPostField, to keep track of this data and to dispose of it once the transaction is complete (and no sooner). Copied from llcorehttp, we now also always set a "Connection: keep-alive" and "Keep-alive: 300" header for POST. This was already done for texture downloads (HttpOpRequest), but now we do it always :p. Might need to be changed in the future, but currently those headers are ignored by the server anyway.
147 lines
5.2 KiB
C++
147 lines
5.2 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 "llviewerprecompiledheaders.h"
|
|
|
|
#include "llsdserialize.h"
|
|
#include "llcurlrequest.h"
|
|
#include "llbuffer.h"
|
|
#include "llbufferstream.h"
|
|
#include "statemachine/aicurleasyrequeststatemachine.h"
|
|
|
|
//-----------------------------------------------------------------------------
|
|
// class Request
|
|
//
|
|
|
|
namespace AICurlInterface {
|
|
|
|
bool Request::get(std::string const& url, ResponderPtr responder)
|
|
{
|
|
return getByteRange(url, headers_t(), 0, -1, responder);
|
|
}
|
|
|
|
bool Request::getByteRange(std::string const& url, headers_t 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);
|
|
}
|
|
|
|
buffered_easy_request->run();
|
|
|
|
return true; // We throw in case of problems.
|
|
}
|
|
|
|
bool Request::post(std::string const& url, headers_t const& headers, std::string const& data, ResponderPtr responder, S32 time_out)
|
|
{
|
|
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);
|
|
llassert_always(success); // AIFIXME: Maybe throw an error.
|
|
if (!success)
|
|
return false;
|
|
buffered_easy_request_w->setPost(bytes);
|
|
buffered_easy_request_w->addHeader("Content-Type: application/octet-stream");
|
|
buffered_easy_request_w->finalizeRequest(url);
|
|
|
|
lldebugs << "POSTING: " << bytes << " bytes." << llendl;
|
|
}
|
|
|
|
buffered_easy_request->run();
|
|
|
|
return true; // We throw in case of problems.
|
|
}
|
|
|
|
bool Request::post(std::string const& url, headers_t const& headers, LLSD const& data, ResponderPtr responder, S32 time_out)
|
|
{
|
|
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);
|
|
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);
|
|
|
|
lldebugs << "POSTING: " << bytes << " bytes." << llendl;
|
|
}
|
|
|
|
buffered_easy_request->run();
|
|
|
|
return true; // We throw in case of problems.
|
|
}
|
|
|
|
} // namespace AICurlInterface
|
|
//==================================================================================
|
|
|