diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-01-16 16:55:41 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2011-01-16 16:55:41 +0900 |
| commit | ea1b4b3ee533146763245ecbbb4a31e3ed791498 (patch) | |
| tree | 5dfda14ff291403bcee9b24380c1e47673b8a98b /src/HttpInitiateConnectionCommand.cc | |
| parent | 602a9d6ba3f8ee38c25448796ad51992f971da8c (diff) | |
Eliminated SocketCore::peekData() form HTTP/FTP downloads.
We introduced SocketRecvBuffer which buffers received bytes. Since
HTTP response header and response body are divided with \r\n, we have
to buffer up several bytes to find this delimiter. We use
SocketRecvBuffer to hold these bytes and only consumes header and
passes SocketRecvBuffer, which may contain head of response body, to
next Command. Since FTPConnection doesn't use SocketCore::peekData(),
we left it as is.
Diffstat (limited to 'src/HttpInitiateConnectionCommand.cc')
| -rw-r--r-- | src/HttpInitiateConnectionCommand.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/HttpInitiateConnectionCommand.cc b/src/HttpInitiateConnectionCommand.cc index b86493f9..5b7f1ced 100644 --- a/src/HttpInitiateConnectionCommand.cc +++ b/src/HttpInitiateConnectionCommand.cc @@ -50,6 +50,7 @@ #include "A2STR.h" #include "util.h" #include "fmt.h" +#include "SocketRecvBuffer.h" namespace aria2 { @@ -94,8 +95,10 @@ Command* HttpInitiateConnectionCommand::createNextCommand getSocket()); command = c; } else if(proxyMethod == V_GET) { + SharedHandle<SocketRecvBuffer> socketRecvBuffer + (new SocketRecvBuffer(getSocket())); SharedHandle<HttpConnection> httpConnection - (new HttpConnection(getCuid(), getSocket())); + (new HttpConnection(getCuid(), getSocket(), socketRecvBuffer)); HttpRequestCommand* c = new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), @@ -111,8 +114,10 @@ Command* HttpInitiateConnectionCommand::createNextCommand } } else { setConnectedAddrInfo(getRequest(), hostname, pooledSocket); + SharedHandle<SocketRecvBuffer> socketRecvBuffer + (new SocketRecvBuffer(pooledSocket)); SharedHandle<HttpConnection> httpConnection - (new HttpConnection(getCuid(), pooledSocket)); + (new HttpConnection(getCuid(), pooledSocket, socketRecvBuffer)); HttpRequestCommand* c = new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), @@ -139,8 +144,10 @@ Command* HttpInitiateConnectionCommand::createNextCommand setSocket(pooledSocket); setConnectedAddrInfo(getRequest(), hostname, pooledSocket); } + SharedHandle<SocketRecvBuffer> socketRecvBuffer + (new SocketRecvBuffer(getSocket())); SharedHandle<HttpConnection> httpConnection - (new HttpConnection(getCuid(), getSocket())); + (new HttpConnection(getCuid(), getSocket(), socketRecvBuffer)); HttpRequestCommand* c = new HttpRequestCommand(getCuid(), getRequest(), getFileEntry(), getRequestGroup(), |