rpms/curl/devel curl-7.18.2-nss-thread-safety.patch,1.1,1.2

[Warren Togami 砥上勇]

Author: wtogami

Update of /cvs/pkgs/rpms/curl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv32129

Modified Files:
	curl-7.18.2-nss-thread-safety.patch 
Log Message:
rediff


curl-7.18.2-nss-thread-safety.patch:

Index: curl-7.18.2-nss-thread-safety.patch
===================================================================
RCS file: /cvs/pkgs/rpms/curl/devel/curl-7.18.2-nss-thread-safety.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 00:47:20 -0000	1.1
+++ curl-7.18.2-nss-thread-safety.patch	4 Sep 2008 01:02:07 -0000	1.2
@@ -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 @@
    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 @@
      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;