github
/
aria2
mirror of https://github.com/aria2/aria2
1
0
Fork 0
Code Issues Releases Wiki Activity

2009-03-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 

Made accepted socket non-block.
	* src/FtpNegotiationCommand.cc
	* src/HttpListenCommand.cc
pull/1/head
Tatsuhiro Tsujikawa 2009-03-28 13:19:47 +00:00
parent 6cbb6d2850
commit 3531d57d37
3 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2009-03-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Made accepted socket non-block.
* src/FtpNegotiationCommand.cc
* src/HttpListenCommand.cc
2009-03-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net> 2009-03-28 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Guarded #ifdef HAVE_POSIX_FALLOCATE Guarded #ifdef HAVE_POSIX_FALLOCATE

2
src/FtpNegotiationCommand.cc
View File

@ -574,7 +574,7 @@ bool FtpNegotiationCommand::waitConnection()
disableReadCheckSocket(); disableReadCheckSocket();
setReadCheckSocket(socket); setReadCheckSocket(socket);
dataSocket.reset(serverSocket->acceptConnection()); dataSocket.reset(serverSocket->acceptConnection());
//dataSocket->setBlockingMode(); dataSocket->setNonBlockingMode();
sequence = SEQ_NEGOTIATION_COMPLETED; sequence = SEQ_NEGOTIATION_COMPLETED;
return false; return false;
} }

1
src/HttpListenCommand.cc
View File

@ -62,6 +62,7 @@ bool HttpListenCommand::execute()
try { try {
if(_serverSocket->isReadable(0)) { if(_serverSocket->isReadable(0)) {
SharedHandle<SocketCore> socket(_serverSocket->acceptConnection()); SharedHandle<SocketCore> socket(_serverSocket->acceptConnection());
socket->setNonBlockingMode();
HttpServerCommand* c = HttpServerCommand* c =
new HttpServerCommand(_e->newCUID(), _e, socket); new HttpServerCommand(_e->newCUID(), _e, socket);
c->setStatus(Command::STATUS_ONESHOT_REALTIME); c->setStatus(Command::STATUS_ONESHOT_REALTIME);