From 9167e8ed1b3ffd002b38d45f4d92b26fbc5a059b Mon Sep 17 00:00:00 2001 From: "wtc%google.com" Date: Thu, 26 Aug 2010 18:06:55 +0000 Subject: [PATCH] Bug 588698: SSL_DataPending only needs to get recvBufLock. r=nelson. Tag: NSS_3_12_BRANCH git-svn-id: svn://10.0.0.236/branches/NSS_3_12_BRANCH@261108 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/security/nss/lib/ssl/sslsecur.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/mozilla/security/nss/lib/ssl/sslsecur.c b/mozilla/security/nss/lib/ssl/sslsecur.c index c143bf60fbc..c9dba0a9064 100644 --- a/mozilla/security/nss/lib/ssl/sslsecur.c +++ b/mozilla/security/nss/lib/ssl/sslsecur.c @@ -37,7 +37,7 @@ * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -/* $Id: sslsecur.c,v 1.43.2.1 2010-07-31 04:33:52 wtc%google.com Exp $ */ +/* $Id: sslsecur.c,v 1.43.2.2 2010-08-26 18:06:55 wtc%google.com Exp $ */ #include "cert.h" #include "secitem.h" #include "keyhi.h" @@ -1358,16 +1358,9 @@ SSL_DataPending(PRFileDesc *fd) ss = ssl_FindSocket(fd); if (ss && ss->opt.useSecurity) { - - ssl_Get1stHandshakeLock(ss); - ssl_GetSSL3HandshakeLock(ss); - ssl_GetRecvBufLock(ss); rv = ss->gs.writeOffset - ss->gs.readOffset; ssl_ReleaseRecvBufLock(ss); - - ssl_ReleaseSSL3HandshakeLock(ss); - ssl_Release1stHandshakeLock(ss); } return rv;