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

Merge branch 'multiSnow-master'

pull/367/merge
Tatsuhiro Tsujikawa 2015-05-14 21:15:23 +09:00
parent 9297bc8c5c e84176d1f0
commit 2a9012ab60
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/SocketCore.cc
View File

@ -808,8 +808,8 @@ void SocketCore::readData(void* data, size_t& len)
wantRead_ = false; wantRead_ = false;
wantWrite_ = false; wantWrite_ = false;
if(sshSession_) {
#ifdef HAVE_LIBSSH2 #ifdef HAVE_LIBSSH2
if(sshSession_) {
ret = sshSession_->readData(data, len); ret = sshSession_->readData(data, len);
if(ret < 0) { if(ret < 0) {
if(ret != SSH_ERR_WOULDBLOCK) { if(ret != SSH_ERR_WOULDBLOCK) {
@ -823,8 +823,10 @@ void SocketCore::readData(void* data, size_t& len)
} }
ret = 0; ret = 0;
} }
#endif // HAVE_LIBSSH2
} else if(!secure_) { } else if(!secure_) {
#else
if(!secure_) {
#endif // HAVE_LIBSSH2
// Cast for Windows recv() // Cast for Windows recv()
while((ret = recv(sockfd_, reinterpret_cast<char*>(data), len, 0)) == -1 && while((ret = recv(sockfd_, reinterpret_cast<char*>(data), len, 0)) == -1 &&
SOCKET_ERRNO == A2_EINTR); SOCKET_ERRNO == A2_EINTR);