wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 595300: Update NSS to NSS_3_12_8_RC0. r=alexei.volkov (see bug 595264)

Browse Source 
a=blocking2.0:betaN
This commit is contained in:
Wan-Teh Chang 2010-09-18 09:28:21 -07:00
parent 83bdf12a71
commit b7df763aad
6 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
security/coreconf/coreconf.dep
View File

@ -42,4 +42,3 @@
*/
#error "Do not include this header file."

2
security/nss/TAG-INFO
View File

@ -1 +1 @@
NSS_3_12_8_BETA3
NSS_3_12_8_RC0

13
security/nss/lib/libpkix/pkix_pl_nss/pki/pkix_pl_infoaccess.c
View File

@ -575,7 +575,6 @@ pkix_pl_InfoAccess_ParseTokens(
{
PKIX_UInt32 len = 0;
PKIX_UInt32 numFilters = 0;
PKIX_Int32 cmpResult = -1;
char *endPos = NULL;
char *p = NULL;
char **filterP = NULL;
@ -629,14 +628,12 @@ pkix_pl_InfoAccess_ParseTokens(
*filterP = p;
while (len) {
if (**startPos == '%') {
if (**startPos == '%' &&
strncmp(*startPos, "%20", 3) == 0) {
/* replace %20 by blank */
cmpResult = strncmp(*startPos, "%20", 3);
if (cmpResult == 0) {
*p = ' ';
*startPos += 3;
len -= 3;
}
*p = ' ';
*startPos += 3;
len -= 3;
} else {
*p = **startPos;
(*startPos)++;

6
security/nss/lib/nss/nss.h
View File

@ -36,7 +36,7 @@
* the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/* $Id: nss.h,v 1.81.2.1 2010/07/19 22:33:36 christophe.ravel.bugs%sun.com Exp $ */
/* $Id: nss.h,v 1.81.2.2 2010/09/16 18:08:52 christophe.ravel.bugs%sun.com Exp $ */
#ifndef __nss_h_
#define __nss_h_
@ -66,12 +66,12 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define NSS_VERSION "3.12.8.0" _NSS_ECC_STRING _NSS_CUSTOMIZED " Beta"
#define NSS_VERSION "3.12.8.0" _NSS_ECC_STRING _NSS_CUSTOMIZED
#define NSS_VMAJOR 3
#define NSS_VMINOR 12
#define NSS_VPATCH 8
#define NSS_VBUILD 0
#define NSS_BETA PR_TRUE
#define NSS_BETA PR_FALSE
#ifndef RC_INVOKED

4
security/nss/lib/softoken/softkver.h
View File

@ -57,11 +57,11 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <ECC>][ <Beta>]"
*/
#define SOFTOKEN_VERSION "3.12.8.0" SOFTOKEN_ECC_STRING " Beta"
#define SOFTOKEN_VERSION "3.12.8.0" SOFTOKEN_ECC_STRING
#define SOFTOKEN_VMAJOR 3
#define SOFTOKEN_VMINOR 12
#define SOFTOKEN_VPATCH 8
#define SOFTOKEN_VBUILD 0
#define SOFTOKEN_BETA PR_TRUE
#define SOFTOKEN_BETA PR_FALSE
#endif /* _SOFTKVER_H_ */

4
security/nss/lib/util/nssutil.h
View File

@ -51,11 +51,11 @@
* The format of the version string should be
* "<major version>.<minor version>[.<patch level>[.<build number>]][ <Beta>]"
*/
#define NSSUTIL_VERSION "3.12.8.0 Beta"
#define NSSUTIL_VERSION "3.12.8.0"
#define NSSUTIL_VMAJOR 3
#define NSSUTIL_VMINOR 12
#define NSSUTIL_VPATCH 8
#define NSSUTIL_VBUILD 0
#define NSSUTIL_BETA PR_TRUE
#define NSSUTIL_BETA PR_FALSE
#endif /* __nssutil_h_ */