Commit 167a9281 authored Oct 18, 2009 by Daniel Stenberg

- Kevin Baughman found a double close() problem with libcurl-NSS, as when

  libcurl called NSS to close the SSL "session" it also closed the actual
  socket.

parent b8b8c3d5

CHANGES

+5 −0

Original line number	Diff line number	Diff line
		@@ -6,6 +6,11 @@

		Changelog

		Daniel Stenberg (18 Oct 2009)
		- Kevin Baughman found a double close() problem with libcurl-NSS, as when
		libcurl called NSS to close the SSL "session" it also closed the actual
		socket.

		Yang Tse (17 Oct 2009)
		- Bug report #2866724 indicated
		(http://curl.haxx.se/bug/view.cgi?id=2866724) that curl on Windows failed

RELEASE-NOTES

+2 −0

Original line number	Diff line number	Diff line
		@@ -36,6 +36,7 @@ This release includes the following bugfixes:
		o don't shrink SO_SNDBUF on windows for those who have it set large already
		o connect next bug
		o invalid file name characters handling on Windows
		o double close() on the primary socket with libcurl-NSS

		This release includes the following known bugs:

		@@ -48,5 +49,6 @@ advice from friends like these:
		Michal Marek, Eric Wong, Guenter Knauf, Peter Sylvester, Daniel Johnson,
		Claes Jakobsson, Sven Anders, Chris Mumford, John P. McCaskey,
		Constantine Sapuntzakis, Michael Stillwell, Tom Mueller, Dan Fandrich,
		Kevin Baughman

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

lib/nss.c

+6 −2

Original line number	Diff line number	Diff line
		@@ -927,6 +927,10 @@ void Curl_nss_close(struct connectdata *conn, int sockindex)

		if(connssl->handle) {
		PR_Close(connssl->handle);

		/* NSS closes the socket we previously handed to it, so we must mark it
		as closed to avoid double close */
		conn->sock[sockindex] = CURL_SOCKET_BAD;
		if(connssl->client_nickname != NULL) {
		free(connssl->client_nickname);
		connssl->client_nickname = NULL;