From 6f6cebe3561e886396737a011b82c2028d7468c7 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 6 Feb 2012 21:18:25 -0500 Subject: [PATCH 1/2] Bring the changelog up to date --- ChangeLog | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9dfbfaeb..f4a4a07f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ -Changes in version 2.0.17-stable (?? ??? 2012) +Changes in version 2.0.17-stable (?? Feb 2012) - {LAST UPDATED AS OF 5408ff3b89677c77b4cb67afd8c65b36dc23a930} + {LAST UPDATED AS OF 5b4b8126de52c8a895094cfea61724a91e179e71} BUGFIXES (core): o Be absolutely sure to clear pncalls before leaving event_signal_closure (11f36a5) @@ -9,13 +9,19 @@ BUGFIXES (core): o Make evconnlistener work around bug in older Linux when getting nmapped (ecfc720) o Fix a list corruption bug when using event_reinit() with signals present (6e41cdc) o Fix a fd leak in event_reinit() (3f18ad1) + o Do a memberwise comparison of threading function tables (c94a5f2 Nate R) + o Use C-style comments in C source files (for compatibility with compilers such as xlc on AIX). (d84d917 Greg Hewgill) BUGFIXES (evbuffer and bufferevents): o Fix behavior of evbuffer_peek(buf,-1,NULL,NULL,0) (c986f23 Zack Weinberg) + o Loop on filtering SSL reads until we are blocked or exhausted. (5b4b812) BUGFIXES (evhttp): o Force strict validation of HTTP version in response. (790f6b3 Catalin Patulea) +BUGFIXES (evdns): + o evdns: fix a bug in circular-queue implementation (d6094b1) + BUILD FIXES: o Fix a silly compilation error with the sun compiler (1927776 Colin Watt) o Suppress a gcc warning from ignoring fwrite return in http-sample.c (7206e8c) @@ -31,7 +37,7 @@ TESTS AND TEST FIXES: o Add function to check referential integrity of an event_base (27737d5) o Check event_base correctness at end of each unit test (3312b02) o Workaround in the unit tests for an apparent epoll bug in Linux 3.2 (dab9187) - + o Better workaround for Linux 3.2 edge-triggered epoll bug (9f9e259) Changes in version 2.0.16-stable (18 Nov 2011) BUGFIXES (core): From 19715a60e28ec2490bbdb45ab36921f5a47fc74d Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Thu, 9 Feb 2012 15:07:19 -0500 Subject: [PATCH 2/2] Avoid crash when freeing event_iocp and using event_set_mem_functions There was a calloc that needed to be an mm_calloc. Reported by "fffvvvzz" on sourceforge. Ticket 3486114 --- event_iocp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/event_iocp.c b/event_iocp.c index de6b70b1..12994222 100644 --- a/event_iocp.c +++ b/event_iocp.c @@ -183,7 +183,7 @@ event_iocp_port_launch(int n_cpus) if (n_cpus <= 0) n_cpus = N_CPUS_DEFAULT; port->n_threads = n_cpus * 2; - port->threads = calloc(port->n_threads, sizeof(HANDLE)); + port->threads = mm_calloc(port->n_threads, sizeof(HANDLE)); if (!port->threads) goto err;