mirror of
https://github.com/aria2/aria2.git
synced 2025-04-05 13:37:40 +03:00
2a81fd466d
Added build-in "Accept-Feature" support. For now only "metalink" is used in this header field. This "metalink" value is removed from the list when connecting URLs fed by metalink file to avoid loop in "transparent" metlaink. * src/HttpRequest.cc * src/HttpRequest.h: Renamed _userHeaders as _headers. Accept-Feature header is also held in this variable. Also renamed setUserHeaders as addHeader and it was rewritten to add header not just to clear the old value. * src/HttpRequestCommand.cc * src/Metalink2RequestGroup.cc: Added the code to remove "metalink" from "Accept-Feature" list. * src/RequestGroup.cc: Added "metalink" to "Accept-Feature" by default. * src/RequestGroup.h * src/TaggedItem.cc: Moved Concat class to a2functional.h. * src/a2functional.h: Included <string> because Concat class depends on it. * test/HttpRequestTest.cc
125 lines
4.1 KiB
C++
125 lines
4.1 KiB
C++
/* <!-- copyright */
|
|
/*
|
|
* aria2 - The high speed download utility
|
|
*
|
|
* Copyright (C) 2006 Tatsuhiro Tsujikawa
|
|
*
|
|
* 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, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
*
|
|
* In addition, as a special exception, the copyright holders give
|
|
* permission to link the code of portions of this program with the
|
|
* OpenSSL library under certain conditions as described in each
|
|
* individual source file, and distribute linked combinations
|
|
* including the two.
|
|
* You must obey the GNU General Public License in all respects
|
|
* for all of the code used other than OpenSSL. If you modify
|
|
* file(s) with this exception, you may extend this exception to your
|
|
* version of the file(s), but you are not obligated to do so. If you
|
|
* do not wish to do so, delete this exception statement from your
|
|
* version. If you delete this exception statement from all source
|
|
* files in the program, then also delete it here.
|
|
*/
|
|
/* copyright --> */
|
|
#include "HttpRequestCommand.h"
|
|
#include "Request.h"
|
|
#include "DownloadEngine.h"
|
|
#include "RequestGroup.h"
|
|
#include "HttpResponseCommand.h"
|
|
#include "HttpConnection.h"
|
|
#include "HttpRequest.h"
|
|
#include "SegmentMan.h"
|
|
#include "Segment.h"
|
|
#include "Option.h"
|
|
#include "Socket.h"
|
|
#include "prefs.h"
|
|
#include "a2functional.h"
|
|
#include "Util.h"
|
|
#include <numeric>
|
|
|
|
namespace aria2 {
|
|
|
|
HttpRequestCommand::HttpRequestCommand
|
|
(int cuid,
|
|
const RequestHandle& req,
|
|
RequestGroup* requestGroup,
|
|
const HttpConnectionHandle& httpConnection,
|
|
DownloadEngine* e,
|
|
const SocketHandle& s)
|
|
:AbstractCommand(cuid, req, requestGroup, e, s),
|
|
_httpConnection(httpConnection)
|
|
{
|
|
disableReadCheckSocket();
|
|
setWriteCheckSocket(socket);
|
|
}
|
|
|
|
HttpRequestCommand::~HttpRequestCommand() {}
|
|
|
|
static SharedHandle<HttpRequest>
|
|
createHttpRequest(const SharedHandle<Request>& req,
|
|
const SharedHandle<Segment>& segment,
|
|
uint64_t totalLength,
|
|
const Option* option,
|
|
const std::deque<std::string>& acceptFeatures)
|
|
{
|
|
HttpRequestHandle httpRequest(new HttpRequest());
|
|
httpRequest->setUserAgent(option->get(PREF_USER_AGENT));
|
|
httpRequest->setRequest(req);
|
|
httpRequest->setSegment(segment);
|
|
httpRequest->setEntityLength(totalLength);
|
|
httpRequest->addHeader(option->get(PREF_HEADER));
|
|
if(acceptFeatures.size()) {
|
|
std::string acceptFeaturesHeader = "Accept-Features: "+
|
|
Util::trim
|
|
(std::accumulate(acceptFeatures.begin()+1, acceptFeatures.end(),
|
|
*acceptFeatures.begin(),
|
|
Concat(",")),
|
|
",");
|
|
httpRequest->addHeader(acceptFeaturesHeader);
|
|
}
|
|
httpRequest->configure(option);
|
|
|
|
return httpRequest;
|
|
}
|
|
|
|
bool HttpRequestCommand::executeInternal() {
|
|
socket->setBlockingMode();
|
|
if(req->getProtocol() == "https") {
|
|
socket->initiateSecureConnection();
|
|
}
|
|
|
|
if(_segments.empty()) {
|
|
HttpRequestHandle httpRequest
|
|
(createHttpRequest(req, SharedHandle<Segment>(),
|
|
_requestGroup->getTotalLength(), e->option,
|
|
_requestGroup->getAcceptFeatures()));
|
|
_httpConnection->sendRequest(httpRequest);
|
|
} else {
|
|
for(Segments::iterator itr = _segments.begin(); itr != _segments.end(); ++itr) {
|
|
const SegmentHandle& segment = *itr;
|
|
if(!_httpConnection->isIssued(segment)) {
|
|
HttpRequestHandle httpRequest
|
|
(createHttpRequest(req, segment,
|
|
_requestGroup->getTotalLength(), e->option,
|
|
_requestGroup->getAcceptFeatures()));
|
|
_httpConnection->sendRequest(httpRequest);
|
|
}
|
|
}
|
|
}
|
|
Command* command = new HttpResponseCommand(cuid, req, _requestGroup, _httpConnection, e, socket);
|
|
e->commands.push_back(command);
|
|
return true;
|
|
}
|
|
|
|
} // namespace aria2
|