diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/third_party/nss/patches/handshakeshortwrite.patch | 4 | ||||
| -rw-r--r-- | net/third_party/nss/ssl/sslsecur.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/net/third_party/nss/patches/handshakeshortwrite.patch b/net/third_party/nss/patches/handshakeshortwrite.patch index 68e4330..cb26d12 100644 --- a/net/third_party/nss/patches/handshakeshortwrite.patch +++ b/net/third_party/nss/patches/handshakeshortwrite.patch @@ -18,8 +18,8 @@ index 816b8f6..dc374e0 100644 + if (!ssl_SocketIsBlocking(ss)) { + ssl_GetXmitBufLock(ss); + if (ss->pendingBuf.len != 0) { -+ rv = ssl_SendSavedWriteData(ss); -+ if ((rv < 0) && (PORT_GetError() != PR_WOULD_BLOCK_ERROR)) { ++ int sent = ssl_SendSavedWriteData(ss); ++ if ((sent < 0) && (PORT_GetError() != PR_WOULD_BLOCK_ERROR)) { + ssl_ReleaseXmitBufLock(ss); + return SECFailure; + } diff --git a/net/third_party/nss/ssl/sslsecur.c b/net/third_party/nss/ssl/sslsecur.c index bb5f0eb..7105125 100644 --- a/net/third_party/nss/ssl/sslsecur.c +++ b/net/third_party/nss/ssl/sslsecur.c @@ -391,8 +391,8 @@ SSL_ForceHandshake(PRFileDesc *fd) if (!ssl_SocketIsBlocking(ss)) { ssl_GetXmitBufLock(ss); if (ss->pendingBuf.len != 0) { - rv = ssl_SendSavedWriteData(ss); - if ((rv < 0) && (PORT_GetError() != PR_WOULD_BLOCK_ERROR)) { + int sent = ssl_SendSavedWriteData(ss); + if ((sent < 0) && (PORT_GetError() != PR_WOULD_BLOCK_ERROR)) { ssl_ReleaseXmitBufLock(ss); return SECFailure; } |