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

Merge branch 'appletls-wantread' of https://github.com/nmaier/aria2 into nmaier-appletls-cred-kc

pull/67/merge
Tatsuhiro Tsujikawa 2013-04-09 01:09:16 +09:00
parent f9225db135 16876a5334
commit 83b801a0a5
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/AppleTLSSession.cc
View File

@ -422,17 +422,22 @@ int AppleTLSSession::closeConnection()
} }
int AppleTLSSession::checkDirection() { int AppleTLSSession::checkDirection() {
if (writeBuffered_) { // See: https://github.com/tatsuhiro-t/aria2/pull/61#issuecomment-16051793
return TLS_WANT_WRITE;
}
if (state_ == st_connected) { if (state_ == st_connected) {
// Need to check read first, as SocketCore kinda expects this
size_t buffered; size_t buffered;
lastError_ = SSLGetBufferedReadSize(sslCtx_, &buffered); lastError_ = SSLGetBufferedReadSize(sslCtx_, &buffered);
if (lastError_ == noErr && buffered) { if (lastError_ == noErr && buffered) {
return TLS_WANT_READ; return TLS_WANT_READ;
} }
} }
return 0;
if (writeBuffered_) {
return TLS_WANT_WRITE;
}
// Default to WANT_READ, as SocketCore kinda expects this
return TLS_WANT_READ;
} }
ssize_t AppleTLSSession::writeData(const void* data, size_t len) ssize_t AppleTLSSession::writeData(const void* data, size_t len)