From e61ba41ed515a7ca282579f90361f2d990918bfe Mon Sep 17 00:00:00 2001
From: "nelson%bolyard.com"
 <nelson%bolyard.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 20 Nov 2008 07:37:25 +0000
Subject: [PATCH] Back out last patch, because it seems to have made
 tinderboxes fail on Windows. Sheriff Nelson

git-svn-id: svn://10.0.0.236/trunk@255148 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/security/nss/lib/ssl/ssl3gthr.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/mozilla/security/nss/lib/ssl/ssl3gthr.c b/mozilla/security/nss/lib/ssl/ssl3gthr.c
index 02e7587f8e8..f4d2e5dd38e 100644
--- a/mozilla/security/nss/lib/ssl/ssl3gthr.c
+++ b/mozilla/security/nss/lib/ssl/ssl3gthr.c
@@ -36,7 +36,7 @@
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: ssl3gthr.c,v 1.8 2008-11-20 00:45:25 nelson%bolyard.com Exp $ */
+/* $Id: ssl3gthr.c,v 1.9 2008-11-20 07:37:25 nelson%bolyard.com Exp $ */
 
 #include "cert.h"
 #include "ssl.h"
@@ -204,11 +204,8 @@ ssl3_GatherCompleteHandshake(sslSocket *ss, int flags)
 	cText.version = (ss->gs.hdr[1] << 8) | ss->gs.hdr[2];
 	cText.buf     = &ss->gs.inbuf;
 	rv = ssl3_HandleRecord(ss, &cText, &ss->gs.buf);
-	if (ss->recvdCloseNotify) {
-	    return 0;
-	}
 	if (rv < 0) {
-	    return rv;
+	    return ss->recvdCloseNotify ? 0 : rv;
 	}
     } while (ss->ssl3.hs.ws != idle_handshake && ss->gs.buf.len == 0);