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

Unified Diff: net/third_party/nss/patches/handshakeshortwrite.patch

Issue 9558017: Update net/third_party/nss to NSS 3.13.3. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Upload before checkin Created 8 years, 10 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
Index: net/third_party/nss/patches/handshakeshortwrite.patch
===================================================================
--- net/third_party/nss/patches/handshakeshortwrite.patch (revision 124804)
+++ net/third_party/nss/patches/handshakeshortwrite.patch (working copy)
@@ -1,40 +0,0 @@
-From eb24998651cb972c60453b5d5fb1e13dfd8107ce Mon Sep 17 00:00:00 2001
-From: Adam Langley <agl@chromium.org>
-Date: Mon, 3 Oct 2011 12:26:44 -0400
-Subject: [PATCH] handshakeshortwrite.patch
-
----
- mozilla/security/nss/lib/ssl/sslsecur.c | 13 ++++++++++++-
- 1 files changed, 12 insertions(+), 1 deletions(-)
-
-diff --git a/mozilla/security/nss/lib/ssl/sslsecur.c b/mozilla/security/nss/lib/ssl/sslsecur.c
-index 816b8f6..dc374e0 100644
---- a/mozilla/security/nss/lib/ssl/sslsecur.c
-+++ b/mozilla/security/nss/lib/ssl/sslsecur.c
-@@ -388,6 +388,18 @@ SSL_ForceHandshake(PRFileDesc *fd)
- if (!ss->opt.useSecurity)
- return SECSuccess;
-
-+ if (!ssl_SocketIsBlocking(ss)) {
-+ ssl_GetXmitBufLock(ss);
-+ if (ss->pendingBuf.len != 0) {
-+ int sent = ssl_SendSavedWriteData(ss);
-+ if ((sent < 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_SecureRecv(sslSocket *ss, unsigned char *buf, int len, int flags)
- ssl_ReleaseXmitBufLock(ss);
- return SECFailure;
- }
-- /* XXX short write? */
- }
- ssl_ReleaseXmitBufLock(ss);
- }
« no previous file with comments | « net/third_party/nss/patches/getrequestedclientcerttypes.patch ('k') | net/third_party/nss/patches/nextproto.patch » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698