diff options
-rw-r--r-- | security/nss/lib/nss/nss.h | 4 | ||||
-rw-r--r-- | security/nss/lib/pk11wrap/Makefile | 5 | ||||
-rw-r--r-- | security/nss/tests/ssl/sslreq.txt | 5 |
3 files changed, 10 insertions, 4 deletions
diff --git a/security/nss/lib/nss/nss.h b/security/nss/lib/nss/nss.h index e6baca71c..075ad791b 100644 --- a/security/nss/lib/nss/nss.h +++ b/security/nss/lib/nss/nss.h @@ -49,11 +49,11 @@ SEC_BEGIN_PROTOS * The format of the version string should be * "<major version>.<minor version>[.<patch level>] [<Beta>]" */ -#define NSS_VERSION "3.8.1 Beta" +#define NSS_VERSION "3.8.1" #define NSS_VMAJOR 3 #define NSS_VMINOR 8 #define NSS_VPATCH 1 -#define NSS_BETA PR_TRUE +#define NSS_BETA PR_FALSE /* diff --git a/security/nss/lib/pk11wrap/Makefile b/security/nss/lib/pk11wrap/Makefile index a84456e7d..307818261 100644 --- a/security/nss/lib/pk11wrap/Makefile +++ b/security/nss/lib/pk11wrap/Makefile @@ -86,3 +86,8 @@ $(OBJDIR)/pk11slot.o: pk11slot.c endif endif endif +ifdef XP_OS2_VACPP +$(OBJDIR)/pk11skey.obj: pk11skey.c + @$(MAKE_OBJDIR) + $(CC) -Fo$@ -c $(filter-out /O+, $(CFLAGS)) $(call abspath,$<) +endif diff --git a/security/nss/tests/ssl/sslreq.txt b/security/nss/tests/ssl/sslreq.txt index 2f7ad7736..16a750fbf 100644 --- a/security/nss/tests/ssl/sslreq.txt +++ b/security/nss/tests/ssl/sslreq.txt @@ -1,2 +1,3 @@ -GET / HTTP/1.0
-
+GET / HTTP/1.0 + + |