rpms/curl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rediff

Browse Source
This commit is contained in:
Warren Togami 2008-09-04 01:02:07 +00:00
parent b42223618d
commit 49abd43b13
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
curl-7.18.2-nss-thread-safety.patch
View File

@ -1,6 +1,6 @@
diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c diff -urN curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
--- curl-7.18.2.orig/lib/nss.c 2008-05-26 11:02:49.000000000 -0400 --- curl-7.18.2.orig/lib/nss.c 2008-09-03 20:56:33.000000000 -0400
+++ curl-7.18.2/lib/nss.c 2008-09-03 13:33:32.000000000 -0400 +++ curl-7.18.2/lib/nss.c 2008-09-03 20:57:07.000000000 -0400
@@ -73,6 +73,8 @@ @@ -73,6 +73,8 @@
PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd); PRFileDesc *PR_ImportTCPSocket(PRInt32 osfd);
@ -44,8 +44,8 @@ diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
initialized = 0; initialized = 0;
} }
@@ -805,7 +820,8 @@ @@ -808,7 +823,8 @@
curlerr = CURLE_SSL_CONNECT_ERROR; return CURLE_OK;
/* FIXME. NSS doesn't support multiple databases open at the same time. */ /* FIXME. NSS doesn't support multiple databases open at the same time. */
- if(!initialized) { - if(!initialized) {
@ -54,7 +54,7 @@ diff -u --recursive curl-7.18.2.orig/lib/nss.c curl-7.18.2/lib/nss.c
initialized = 1; initialized = 1;
certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */ certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
@@ -829,8 +845,11 @@ @@ -832,8 +848,11 @@
if(rv != SECSuccess) { if(rv != SECSuccess) {
infof(conn->data, "Unable to initialize NSS database\n"); infof(conn->data, "Unable to initialize NSS database\n");
curlerr = CURLE_SSL_CACERT_BADFILE; curlerr = CURLE_SSL_CACERT_BADFILE;