Commit a24fe59e authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

- Kamil Dudka made NSS-powered builds compile and run again!

parent 4ad296c6

CHANGES

+2 −0
Original line number Diff line number Diff line
@@ -7,6 +7,8 @@ 
                                  Changelog



Daniel Stenberg (17 Feb 2009)

- Kamil Dudka made NSS-powered builds compile and run again!



- A second follow-up change by Andre Guibert de Bruet to fix a related memory

  leak like that fixed on the 14th. When zlib returns failure, we need to

  cleanup properly before returning error.

RELEASE-NOTES

+3 −1
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ This release includes the following bugfixes: 
 o CURLINFO_CONTENT_LENGTH_DOWNLOAD size from file:// "transfers" with

   CURLOPT_NOBODY set true

 o memory leak on some libz errors for content encodings

 o NSS-enabled build is repaired



This release includes the following known bugs:
@@ -44,6 +45,7 @@ advice from friends like these: 


 Lisa Xu, Daniel Fandrich, Craig A West, Alexey Borzov, Sharad Gupta,

 Peter Sylvester, Chad Monroe, Markus Moeller, Yang Tse, Scott Cantor,

 Patrick Scott, Hidemoto Nakada, Jocelyn Jaubert, Andre Guibert de Bruet

 Patrick Scott, Hidemoto Nakada, Jocelyn Jaubert, Andre Guibert de Bruet,

 Kamil Dudka



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

lib/nss.c

+3 −2
Original line number Diff line number Diff line
@@ -1140,7 +1140,7 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex) 
      n = strrchr(data->set.str[STRING_CERT], '/');

      if(n) {

        n++; /* skip last slash */

        nickname = aprintf(nickname, "PEM Token #%d:%s", 1, n);

        nickname = aprintf("PEM Token #%d:%s", 1, n);

        if(!nickname)

          return CURLE_OUT_OF_MEMORY;
@@ -1171,7 +1171,8 @@ CURLcode Curl_nss_connect(struct connectdata *conn, int sockindex) 


    if(SSL_GetClientAuthDataHook(model,

                                 (SSLGetClientAuthData) SelectClientCert,

                                 (void *)connssl) != SECSuccess) {

                                 (void *)connssl->client_nickname) !=

       SECSuccess) {

      curlerr = CURLE_SSL_CERTPROBLEM;

      goto error;

    }