Ver Fonte

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

	Made accepted socket non-block.
	* src/FtpNegotiationCommand.cc
	* src/HttpListenCommand.cc
Tatsuhiro Tsujikawa há 16 anos atrás
pai
commit
3531d57d37
3 ficheiros alterados com 8 adições e 1 exclusões
  1. 6 0
      ChangeLog
  2. 1 1
      src/FtpNegotiationCommand.cc
  3. 1 0
      src/HttpListenCommand.cc

+ 6 - 0
ChangeLog

@@ -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>
 
 	Guarded #ifdef HAVE_POSIX_FALLOCATE

+ 1 - 1
src/FtpNegotiationCommand.cc

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

+ 1 - 0
src/HttpListenCommand.cc

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