summaryrefslogtreecommitdiff
path: root/src/HttpServerCommand.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-01-05 16:01:46 +0000
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2010-01-05 16:01:46 +0000
commit4db349c1f32b4a313d12d114137432441633d00a (patch)
tree417451971e264834312cfd8339c79930d680a5d1 /src/HttpServerCommand.cc
parent338e8aca09331d3e7fa4e1e8e1f9d10260986772 (diff)
2010-01-06 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Untabify. Fixed one line in copyright which is longer than 80 columns. * src * test
Diffstat (limited to 'src/HttpServerCommand.cc')
-rw-r--r--src/HttpServerCommand.cc60
1 files changed, 30 insertions, 30 deletions
diff --git a/src/HttpServerCommand.cc b/src/HttpServerCommand.cc
index b6c20754..03edd761 100644
--- a/src/HttpServerCommand.cc
+++ b/src/HttpServerCommand.cc
@@ -16,7 +16,7 @@
*
* 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
+ * 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
@@ -51,7 +51,7 @@
namespace aria2 {
HttpServerCommand::HttpServerCommand(int32_t cuid, DownloadEngine* e,
- const SharedHandle<SocketCore>& socket):
+ const SharedHandle<SocketCore>& socket):
Command(cuid),
_e(e),
_socket(socket),
@@ -60,13 +60,13 @@ HttpServerCommand::HttpServerCommand(int32_t cuid, DownloadEngine* e,
setStatus(Command::STATUS_ONESHOT_REALTIME);
_e->addSocketForReadCheck(_socket, this);
_httpServer->setUsernamePassword(_e->option->get(PREF_XML_RPC_USER),
- _e->option->get(PREF_XML_RPC_PASSWD));
+ _e->option->get(PREF_XML_RPC_PASSWD));
}
HttpServerCommand::HttpServerCommand(int32_t cuid,
- const SharedHandle<HttpServer>& httpServer,
- DownloadEngine* e,
- const SharedHandle<SocketCore>& socket):
+ const SharedHandle<HttpServer>& httpServer,
+ DownloadEngine* e,
+ const SharedHandle<SocketCore>& socket):
Command(cuid),
_e(e),
_socket(socket),
@@ -93,46 +93,46 @@ bool HttpServerCommand::execute()
header = _httpServer->receiveRequest();
if(header.isNull()) {
- _e->commands.push_back(this);
- return false;
+ _e->commands.push_back(this);
+ return false;
}
if(!_httpServer->authenticate()) {
- _httpServer->disableKeepAlive();
- _httpServer->feedResponse("401 Unauthorized",
- "WWW-Authenticate: Basic realm=\"aria2\"",
- "","text/html");
- Command* command =
- new HttpServerResponseCommand(cuid, _httpServer, _e, _socket);
- _e->commands.push_back(command);
- _e->setNoWait(true);
- return true;
+ _httpServer->disableKeepAlive();
+ _httpServer->feedResponse("401 Unauthorized",
+ "WWW-Authenticate: Basic realm=\"aria2\"",
+ "","text/html");
+ Command* command =
+ new HttpServerResponseCommand(cuid, _httpServer, _e, _socket);
+ _e->commands.push_back(command);
+ _e->setNoWait(true);
+ return true;
}
if(static_cast<uint64_t>
- (_e->option->getAsInt(PREF_XML_RPC_MAX_REQUEST_SIZE)) <
- _httpServer->getContentLength()) {
- logger->info("Request too long. ContentLength=%s."
- " See --xml-rpc-max-request-size option to loose"
- " this limitation.",
- util::uitos(_httpServer->getContentLength()).c_str());
- return true;
+ (_e->option->getAsInt(PREF_XML_RPC_MAX_REQUEST_SIZE)) <
+ _httpServer->getContentLength()) {
+ logger->info("Request too long. ContentLength=%s."
+ " See --xml-rpc-max-request-size option to loose"
+ " this limitation.",
+ util::uitos(_httpServer->getContentLength()).c_str());
+ return true;
}
Command* command = new HttpServerBodyCommand(cuid, _httpServer, _e,
- _socket);
+ _socket);
_e->commands.push_back(command);
_e->setNoWait(true);
return true;
} else {
if(_timeout.elapsed(30)) {
- logger->info("HTTP request timeout.");
- return true;
+ logger->info("HTTP request timeout.");
+ return true;
} else {
- _e->commands.push_back(this);
- return false;
+ _e->commands.push_back(this);
+ return false;
}
}
} catch(RecoverableException& e) {
logger->info("CUID#%d - Error occurred while reading HTTP request",
- e, cuid);
+ e, cuid);
return true;
}