Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(453)

Unified Diff: net/third_party/nss/ssl/sslsecur.c

Issue 7572043: SSL_ForceHandshake should send the saved write data in the SSL socket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/third_party/nss/patches/handshakeshortwrite.patch ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/third_party/nss/ssl/sslsecur.c
===================================================================
--- net/third_party/nss/ssl/sslsecur.c (revision 95318)
+++ net/third_party/nss/ssl/sslsecur.c (working copy)
@@ -388,6 +388,18 @@
if (!ss->opt.useSecurity)
return SECSuccess;
+ 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)) {
+ ssl_ReleaseXmitBufLock(ss);
+ return SECFailure;
+ }
+ }
+ ssl_ReleaseXmitBufLock(ss);
+ }
+
ssl_Get1stHandshakeLock(ss);
if (ss->version >= SSL_LIBRARY_VERSION_3_0) {
@@ -1128,7 +1140,6 @@
ssl_ReleaseXmitBufLock(ss);
return SECFailure;
}
- /* XXX short write? */
}
ssl_ReleaseXmitBufLock(ss);
}
« no previous file with comments | « net/third_party/nss/patches/handshakeshortwrite.patch ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698