diff options
author | wtc%netscape.com <devnull@localhost> | 2002-06-21 21:40:15 +0000 |
---|---|---|
committer | wtc%netscape.com <devnull@localhost> | 2002-06-21 21:40:15 +0000 |
commit | bf9e4930b4947c6133ac3a4adcf4221a79bf374e (patch) | |
tree | 3ea557db7e4793dc7084df2598edeab35b981a25 | |
parent | 9c0255c73bd07f0485a194ab87088bcd1bd44f9f (diff) | |
download | nspr-hg-bf9e4930b4947c6133ac3a4adcf4221a79bf374e.tar.gz |
Bug 151671: merged NSPR 4.2 and 4.2.1 fixes into MOZILLA_1_0_BRANCH.
With mozilla1.0.1+ and adt1.0.1+ approvals.
Modified files: repackage.sh prdepend.h base64.c prinit.h ptio.c vercheck.c
-rwxr-xr-x | admin/repackage.sh | 20 | ||||
-rw-r--r-- | config/prdepend.h | 1 | ||||
-rw-r--r-- | lib/libc/src/base64.c | 2 | ||||
-rw-r--r-- | pr/include/prinit.h | 4 | ||||
-rw-r--r-- | pr/src/pthreads/ptio.c | 4 | ||||
-rw-r--r-- | pr/tests/vercheck.c | 8 |
6 files changed, 21 insertions, 18 deletions
diff --git a/admin/repackage.sh b/admin/repackage.sh index 2a705c49..338c6de1 100755 --- a/admin/repackage.sh +++ b/admin/repackage.sh @@ -60,10 +60,10 @@ # # These variables should be modified for each NSPR release. # -FROMTOP=/share/builds/components/nspr20/v4.1.1 -TOTOP=./v4.1.1 -NSPRDIR=nspr-4.1.1 -SOURCETAG=NSPRPUB_RELEASE_4_1_1 +FROMTOP=/share/builds/components/nspr20/v4.2.1 +TOTOP=./v4.2.1 +NSPRDIR=nspr-4.2.1 +SOURCETAG=NSPR_4_2_1_RELEASE # # enumerate Unix object directories on /s/b/c @@ -80,12 +80,16 @@ IRIX6.5_n32_PTH_DBG.OBJ IRIX6.5_n32_PTH_OPT.OBJ Linux2.2_x86_glibc_PTH_DBG.OBJ Linux2.2_x86_glibc_PTH_OPT.OBJ -OSF1V4.0D_DBG.OBJ -OSF1V4.0D_OPT.OBJ +Linux2.4_x86_glibc_PTH_DBG.OBJ +Linux2.4_x86_glibc_PTH_OPT.OBJ +OSF1V5.0_DBG.OBJ +OSF1V5.0_OPT.OBJ SunOS5.6_DBG.OBJ SunOS5.6_OPT.OBJ -SunOS5.7_64_DBG.OBJ -SunOS5.7_64_OPT.OBJ +SunOS5.8_64_DBG.OBJ +SunOS5.8_64_OPT.OBJ +SunOS5.8_DBG.OBJ +SunOS5.8_OPT.OBJ " # # enumerate Windows object directories on /s/b/c diff --git a/config/prdepend.h b/config/prdepend.h index 28c1b139..8bebd56b 100644 --- a/config/prdepend.h +++ b/config/prdepend.h @@ -39,4 +39,3 @@ */ #error "Do not include this header file." - diff --git a/lib/libc/src/base64.c b/lib/libc/src/base64.c index 749965f7..00f19ab2 100644 --- a/lib/libc/src/base64.c +++ b/lib/libc/src/base64.c @@ -383,7 +383,7 @@ PL_Base64Decode srclen = PL_strlen(src); } - if( 0 == (srclen & 3) ) + if( srclen && (0 == (srclen & 3)) ) { if( (char)'=' == src[ srclen-1 ] ) { diff --git a/pr/include/prinit.h b/pr/include/prinit.h index 0e8e124c..1635c2d1 100644 --- a/pr/include/prinit.h +++ b/pr/include/prinit.h @@ -60,10 +60,10 @@ PR_BEGIN_EXTERN_C ** The format of the version string is ** "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define PR_VERSION "4.2 Beta" +#define PR_VERSION "4.2.1 Beta" #define PR_VMAJOR 4 #define PR_VMINOR 2 -#define PR_VPATCH 0 +#define PR_VPATCH 1 #define PR_BETA PR_TRUE /* diff --git a/pr/src/pthreads/ptio.c b/pr/src/pthreads/ptio.c index 61e75a0d..22a703d0 100644 --- a/pr/src/pthreads/ptio.c +++ b/pr/src/pthreads/ptio.c @@ -1055,9 +1055,8 @@ static PRBool pt_solaris_sendfile_cont(pt_Continuation *op, PRInt16 revents) ssize_t count; count = SOLARIS_SENDFILEV(op->arg1.osfd, vec, op->arg3.amount, &xferred); - PR_ASSERT((count == -1) || (count == xferred)); - PR_ASSERT(xferred <= op->nbytes_to_send); op->syserrno = errno; + PR_ASSERT((count == -1) || (count == xferred)); if (count == -1) { if (op->syserrno != EWOULDBLOCK && op->syserrno != EAGAIN @@ -1067,6 +1066,7 @@ static PRBool pt_solaris_sendfile_cont(pt_Continuation *op, PRInt16 revents) } count = xferred; } + PR_ASSERT(count <= op->nbytes_to_send); op->result.code += count; if (count < op->nbytes_to_send) { diff --git a/pr/tests/vercheck.c b/pr/tests/vercheck.c index 4235a832..cf3da2e7 100644 --- a/pr/tests/vercheck.c +++ b/pr/tests/vercheck.c @@ -49,12 +49,12 @@ #include <stdlib.h> /* - * This release (4.2) is backward compatible with the - * 4.0.x and 4.1.x releases. It, of course, is compatible + * This release (4.2.1) is backward compatible with the + * 4.0.x, 4.1.x, and 4.2 releases. It, of course, is compatible * with itself. */ static char *compatible_version[] = { - "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", PR_VERSION + "4.0", "4.0.1", "4.1", "4.1.1", "4.1.2", "4.1.3", "4.2", PR_VERSION }; /* @@ -69,7 +69,7 @@ static char *incompatible_version[] = { "3.0", "3.0.1", "3.1", "3.1.1", "3.1.2", "3.1.3", "3.5", "3.5.1", - "4.2.3", + "4.2.2", "4.2.3", "4.3", "4.3.1", "10.0", "11.1", "12.14.20" }; |