Commit 0bf9c1e8 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- Claes Jakobsson fixed libcurl-NSS to build fine even without the 

  PK11_CreateGenericObject() function.
parent bf07d377

CHANGES

+3 −0
Original line number Diff line number Diff line
@@ -17,6 +17,9 @@ Daniel Stenberg (27 May 2009) 
  the auth credentials back in 7.19.0 and earlier while now you have to set ""

  to get the same effect. His patch brings back the ability to use NULL.



- Claes Jakobsson fixed libcurl-NSS to build fine even without the

  PK11_CreateGenericObject() function.



Daniel Stenberg (25 May 2009)

- bug report #2796358 (http://curl.haxx.se/bug/view.cgi?id=2796358) pointed

  out that the cookie parser would leak memory when it parses cookies that are

RELEASE-NOTES

+2 −1
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ This release includes the following bugfixes: 
 o leaking cookie memory when duplicate domains or paths were used

 o build fix for Symbian

 o CURLOPT_USERPWD set to NULL clears auth credentials

 o libcurl-NSS build fix



This release includes the following known bugs:
@@ -26,6 +27,6 @@ This release would not have looked like this without help, code, reports and 
advice from friends like these:



 Kamil Dudka, Caolan McNamara, Frank McGeough, Andre Guibert de Bruet,

 Mike Crowe

 Mike Crowe, Claes Jakobsson



        Thanks! (and sorry if I forgot to mention someone)

lib/nss.c

+4 −0
Original line number Diff line number Diff line
@@ -914,12 +914,14 @@ void Curl_nss_close(struct connectdata *conn, int sockindex) 
    }

    if(connssl->client_cert)

      CERT_DestroyCertificate(connssl->client_cert);

#ifdef HAVE_PK11_CREATEGENERICOBJECT      

    if(connssl->key)

      (void)PK11_DestroyGenericObject(connssl->key);

    if(connssl->cacert[1])

      (void)PK11_DestroyGenericObject(connssl->cacert[1]);

    if(connssl->cacert[0])

      (void)PK11_DestroyGenericObject(connssl->cacert[0]);

#endif

    connssl->handle = NULL;

  }

}
@@ -956,9 +958,11 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex) 
    return CURLE_OK;



  connssl->client_cert = NULL;

#ifdef HAVE_PK11_CREATEGENERICOBJECT  

  connssl->cacert[0] = NULL;

  connssl->cacert[1] = NULL;

  connssl->key = NULL;

#endif



  /* FIXME. NSS doesn't support multiple databases open at the same time. */

  PR_Lock(nss_initlock);