Fix a bug when sending a file (#92)

an-tao · web-flow · commit 1be32c592467 · 2020-05-29T10:00:02.000+08:00
diff --git a/trantor/net/inner/TcpConnectionImpl.cc b/trantor/net/inner/TcpConnectionImpl.cc
@@ -1201,8 +1201,8 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)
     while (filePtr->fileBytesToSend_ > 0)
     {
         auto n = fread(&(*fileBufferPtr_)[0],
-                       fileBufferPtr_->size(),
                        1,
+                       fileBufferPtr_->size(),
                        filePtr->sendFp_);
 #endif
         if (n > 0)
@@ -1240,7 +1240,7 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)
                     LOG_SYSERR << "Unexpected error(" << errno << ")";
                     return;
                 }
-                return;
+                break;
             }
         }
         if (n < 0)
@@ -1253,7 +1253,7 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)
         if (n == 0)
         {
             LOG_SYSERR << "read";
-            break;
+            return;
         }
     }
     if (!ioChannelPtr_->isWriting())

Original file line number	Diff line number	Diff line change
`@@ -1201,8 +1201,8 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)`
`1201`	`1201`	`while (filePtr->fileBytesToSend_ > 0)`
`1202`	`1202`	`{`
`1203`	`1203`	`auto n = fread(&(*fileBufferPtr_)[0],`
`1204`		`- fileBufferPtr_->size(),`
`1205`	`1204`	`1,`
	`1205`	`+ fileBufferPtr_->size(),`
`1206`	`1206`	`filePtr->sendFp_);`
`1207`	`1207`	`#endif`
`1208`	`1208`	`if (n > 0)`
`@@ -1240,7 +1240,7 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)`
`1240`	`1240`	`LOG_SYSERR << "Unexpected error(" << errno << ")";`
`1241`	`1241`	`return;`
`1242`	`1242`	`}`
`1243`		`- return;`
	`1243`	`+ break;`
`1244`	`1244`	`}`
`1245`	`1245`	`}`
`1246`	`1246`	`if (n < 0)`
`@@ -1253,7 +1253,7 @@ void TcpConnectionImpl::sendFileInLoop(const BufferNodePtr &filePtr)`
`1253`	`1253`	`if (n == 0)`
`1254`	`1254`	`{`
`1255`	`1255`	`LOG_SYSERR << "read";`
`1256`		`- break;`
	`1256`	`+ return;`
`1257`	`1257`	`}`
`1258`	`1258`	`}`
`1259`	`1259`	`if (!ioChannelPtr_->isWriting())`