Update net/third_party/nss to NSS 3.13.3.

net/third_party/nss/ssl/sslmutex.c

 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
  * Software distributed under the License is distributed on an "AS IS" basis,
  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
@@ skipping 15 matching lines @@
  * in which case the provisions of the GPL or the LGPL are applicable instead
  * of those above. If you wish to allow use of your version of this file only
  * under the terms of either the GPL or the LGPL, and not to allow others to
  * use your version of this file under the terms of the MPL, indicate your
  * decision by deleting the provisions above and replace them with the notice
  * and other provisions required by the GPL or the LGPL. If you do not delete
  * the provisions above, a recipient may use your version of this file under
  * the terms of any one of the MPL, the GPL or the LGPL.
  *
  * ***** END LICENSE BLOCK ***** */
-/* $Id: sslmutex.c,v 1.25 2010/04/03 18:27:33 nelson%bolyard.com Exp $ */
+/* $Id: sslmutex.c,v 1.27 2011/10/01 00:11:02 wtc%google.com Exp $ */
 
 #include "seccomon.h"
 /* This ifdef should match the one in sslsnce.c */
 #if defined(XP_UNIX) || defined(XP_WIN32) || defined (XP_OS2) || defined(XP_BEOS)
 
 #include "sslmutex.h"
 #include "prerr.h"
 
 static SECStatus single_process_sslMutex_Init(sslMutex* pMutex)
 {
@@ skipping 114 matching lines @@
 #endif
 
 loser:
     nss_MD_unix_map_default_error(errno);
     close(pMutex->u.pipeStr.mPipes[0]);
     close(pMutex->u.pipeStr.mPipes[1]);
     return SECFailure;
 }
 
 SECStatus
-sslMutex_Destroy(sslMutex *pMutex)
+sslMutex_Destroy(sslMutex *pMutex, PRBool processLocal)
 {
     if (PR_FALSE == pMutex->isMultiProcess) {
         return single_process_sslMutex_Destroy(pMutex);
     }
     if (pMutex->u.pipeStr.mPipes[2] != SSL_MUTEX_MAGIC) {
         PORT_SetError(PR_INVALID_ARGUMENT_ERROR);
         return SECFailure;
     }
     close(pMutex->u.pipeStr.mPipes[0]);
     close(pMutex->u.pipeStr.mPipes[1]);
 
+    if (processLocal) {
+        return SECSuccess;
+    }
+
     pMutex->u.pipeStr.mPipes[0] = -1;
     pMutex->u.pipeStr.mPipes[1] = -1;
     pMutex->u.pipeStr.mPipes[2] = -1;
     pMutex->u.pipeStr.nWaiters  =  0;
 
     return SECSuccess;
 }
 
 #if defined(LINUX) && defined(i386)
 /* No memory barrier needed for this platform */
@@ skipping 209 matching lines @@
     if (hMutex == NULL) {
         hMutex = INVALID_HANDLE_VALUE;
         nss_MD_win32_map_default_error(GetLastError());
         return SECFailure;
     }
     pMutex->u.sslMutx = hMutex;
     return SECSuccess;
 }
 
 SECStatus
-sslMutex_Destroy(sslMutex *pMutex)
+sslMutex_Destroy(sslMutex *pMutex, PRBool processLocal)
 {
     HANDLE hMutex;
     int    rv;
     int retvalue = SECSuccess;
 
     PR_ASSERT(pMutex != 0);
     if (PR_FALSE == pMutex->isMultiProcess) {
         return single_process_sslMutex_Destroy(pMutex);
     }
 
     /*  multi-process mode */    
 #ifdef WINNT
     /* on NT, get rid of the PRLock used for fibers within a process */
     retvalue = sslMutex_2LevelDestroy(pMutex);
 #endif
     
     PR_ASSERT( pMutex->u.sslMutx != 0 && 
                pMutex->u.sslMutx != INVALID_HANDLE_VALUE);
     if (!pMutex || (hMutex = pMutex->u.sslMutx) == 0 
         || hMutex == INVALID_HANDLE_VALUE) {
         PORT_SetError(PR_INVALID_ARGUMENT_ERROR);
         return SECFailure;
     }
     
     rv = CloseHandle(hMutex); /* ignore error */
-    if (rv) {
+    if (!processLocal && rv) {
         pMutex->u.sslMutx = hMutex = INVALID_HANDLE_VALUE;
-    } else {
+    }
+    if (!rv) {
         nss_MD_win32_map_default_error(GetLastError());
         retvalue = SECFailure;
     }
     return retvalue;
 }
 
 int 
 sslMutex_Unlock(sslMutex *pMutex)
 {
     BOOL   success = FALSE;
@@ skipping 99 matching lines @@
         rv = sem_init(&pMutex->u.sem, shared, 1);
     } while (rv < 0 && errno == EINTR);
     if (rv < 0) {
         nss_MD_unix_map_default_error(errno);
         return SECFailure;
     }
     return SECSuccess;
 }
 
 SECStatus 
-sslMutex_Destroy(sslMutex *pMutex)
+sslMutex_Destroy(sslMutex *pMutex, PRBool processLocal)
 {
     int rv;
     if (PR_FALSE == pMutex->isMultiProcess) {
         return single_process_sslMutex_Destroy(pMutex);
     }
+
+    /* semaphores are global resources. See SEM_DESTROY(3) man page */
+    if (processLocal) {
+        return SECSuccess;
+    }
     do {
         rv = sem_destroy(&pMutex->u.sem);
     } while (rv < 0 && errno == EINTR);
     if (rv < 0) {
         nss_MD_unix_map_default_error(errno);
         return SECFailure;
     }
     return SECSuccess;
 }
 
@@ skipping 40 matching lines @@
     pMutex->isMultiProcess = (PRBool)(shared != 0);
     if (!shared) {
         return single_process_sslMutex_Init(pMutex);
     }
     PORT_Assert(!("sslMutex_Init not implemented for multi-process applications !"));
     PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
     return SECFailure;
 }
 
 SECStatus 
-sslMutex_Destroy(sslMutex *pMutex)
+sslMutex_Destroy(sslMutex *pMutex, PRBool processLocal)
 {
     PR_ASSERT(pMutex);
     if (PR_FALSE == pMutex->isMultiProcess) {
         return single_process_sslMutex_Destroy(pMutex);
     }
     PORT_Assert(!("sslMutex_Destroy not implemented for multi-process applications !"));
     PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
     return SECFailure;
 }
 
@@ skipping 17 matching lines @@
         return single_process_sslMutex_Lock(pMutex);
     }
     PORT_Assert(!("sslMutex_Lock not implemented for multi-process applications !"));
     PORT_SetError(PR_NOT_IMPLEMENTED_ERROR);
     return SECFailure;
 }
 
 #endif
 
 #endif