rediff
This commit is contained in:
parent
b42223618d
commit
49abd43b13
@ -1,6 +1,6 @@
|
||||
diff -u --recursive 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/lib/nss.c 2008-09-03 13:33:32.000000000 -0400
|
||||
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-09-03 20:56:33.000000000 -0400
|
||||
+++ curl-7.18.2/lib/nss.c 2008-09-03 20:57:07.000000000 -0400
|
||||
@@ -73,6 +73,8 @@
|
||||
|
||||
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;
|
||||
}
|
||||
|
||||
@@ -805,7 +820,8 @@
|
||||
curlerr = CURLE_SSL_CONNECT_ERROR;
|
||||
@@ -808,7 +823,8 @@
|
||||
return CURLE_OK;
|
||||
|
||||
/* FIXME. NSS doesn't support multiple databases open at the same time. */
|
||||
- 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;
|
||||
|
||||
certDir = getenv("SSL_DIR"); /* Look in $SSL_DIR */
|
||||
@@ -829,8 +845,11 @@
|
||||
@@ -832,8 +848,11 @@
|
||||
if(rv != SECSuccess) {
|
||||
infof(conn->data, "Unable to initialize NSS database\n");
|
||||
curlerr = CURLE_SSL_CACERT_BADFILE;
|
||||
|
Loading…
Reference in New Issue
Block a user