diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-03-15 15:07:18 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2007-03-15 15:07:18 +0000 |
| commit | 11907c175d9e3e6f4069df79dade320b6f93cd7f (patch) | |
| tree | d866782e0cc2a2eafd48ae3ac2612c280cdd6daa /src/HttpDownloadCommand.cc | |
| parent | ba7f9f765794bc197750253f07211c66afdd69e5 (diff) | |
2007-03-15 Tatsuhiro Tsujikawa <tujikawa at rednoah dot com>
To handle Segment as SegmentHandle:
* src/AbstractCommand.cc (execute): Rewritten.
* src/SegmentMan.h: Segment -> SegmentHandle
Introducded HttpResponse class, HttpRequest class to improve
code
extensiveness and make it clear:
* src/HttpDownloadCommand.cc: transfer encoders are now managed
by
HttpResponse class.
* src/HttpRequest.h, src/HttpRequest.cc: New class.
* src/HttpResponse.h, src/HttpResponse.cc: New class.
* src/HttpConnection.cc: Contruction of http request were moved
to
HttpRequest class.
* src/HttpResponseCommand.h, src/HttpResponseCommand.cc:
Refactored.
* src/HttpRequestCommand.cc (executeInternal): Rewritten.
* src/HttpAuthConfig.h: New class.
* src/Range.h: New class.
To make FtpTunnel{Request, Response}Command and
HttpProxy{Request, Response}Command derived from
AbstractProxy{Request, Response}Command:
* src/FtpTunnelResponseCommand.h,
src/FtpTunnelResponseCommand.cc:
Derived from AbstractProxyRequestCommand class.
* src/FtpTunnelRequestCommand.h, src/FtpTunnelRequestCommand.cc:
Derived from AbstractProxyResponseCommand class.
* src/HttpProxyRequestCommand.h, src/HttpProxyRequestCommand.cc:
Derived from AbstractProxyRequestCommand class.
* src/HttpProxyResponseCommand.h,
src/HttpProxyResponseCommand.cc:
Derived from AbstractProxyResponseCommand class.
* src/AbstractProxyRequestCommand.h,
src/AbstractProxyRequestCommand.cc
: New class.
* src/AbstractProxyResponseCommand.h,
src/AbstractProxyResponseCommand.cc: New class.
To add netrc support:
* src/Netrc.h, src/Netrc.cc: New class.
* src/Util.h, src/Util.cc (split): New function.
* src/HttpHeader.cc (getRange): Fixed so that it inspects
"Content-Range" header instead of "Range" header.
* src/HttpHeader.h
(getStatus): Removed.
(setStatus): Removed.
* src/Segment.h
(getPositionToWrite): New function.
Diffstat (limited to 'src/HttpDownloadCommand.cc')
| -rw-r--r-- | src/HttpDownloadCommand.cc | 31 |
1 files changed, 6 insertions, 25 deletions
diff --git a/src/HttpDownloadCommand.cc b/src/HttpDownloadCommand.cc index 9ea89ef4..969addf9 100644 --- a/src/HttpDownloadCommand.cc +++ b/src/HttpDownloadCommand.cc @@ -33,38 +33,19 @@ */ /* copyright --> */ #include "HttpDownloadCommand.h" -#include "DlRetryEx.h" #include "HttpRequestCommand.h" #include "Util.h" -#include "ChunkedEncoding.h" #include "message.h" -#include <sys/time.h> -#include <sys/types.h> -#include <unistd.h> -#include <algorithm> -using namespace std; - -HttpDownloadCommand::HttpDownloadCommand(int cuid, const RequestHandle req, +HttpDownloadCommand::HttpDownloadCommand(int cuid, + const RequestHandle req, DownloadEngine* e, const SocketHandle& socket) - :DownloadCommand(cuid, req, e, socket) -{ - ChunkedEncoding* ce = new ChunkedEncoding(); - transferEncodings["chunked"] = ce; -} - -HttpDownloadCommand::~HttpDownloadCommand() { - for(map<string, TransferEncoding*>::iterator itr = transferEncodings.begin(); itr != transferEncodings.end(); itr++) { - delete((*itr).second); - } -} + :DownloadCommand(cuid, req, e, socket) {} -TransferEncoding* HttpDownloadCommand::getTransferEncoding(const string& name) { - return transferEncodings[name]; -} +HttpDownloadCommand::~HttpDownloadCommand() {} -bool HttpDownloadCommand::prepareForNextSegment(const Segment& currentSegment) { +bool HttpDownloadCommand::prepareForNextSegment() { if(e->segmentMan->finished()) { return true; } else { @@ -73,7 +54,7 @@ bool HttpDownloadCommand::prepareForNextSegment(const Segment& currentSegment) { e->commands.push_back(command); return true; } else { - return DownloadCommand::prepareForNextSegment(currentSegment); + return DownloadCommand::prepareForNextSegment(); } } } |
