From 3c824bd3347a4f317481af56f26f3f7dc58e5e90 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Mon, 24 Oct 2011 13:18:09 -0400 Subject: [PATCH 1/2] Update copyright dates to 2011. --- LICENSE | 2 +- buffer.c | 2 +- buffer_iocp.c | 2 +- bufferevent-internal.h | 2 +- bufferevent.c | 2 +- bufferevent_async.c | 2 +- bufferevent_filter.c | 2 +- bufferevent_openssl.c | 2 +- bufferevent_pair.c | 2 +- bufferevent_ratelim.c | 2 +- bufferevent_sock.c | 2 +- changelist-internal.h | 2 +- defer-internal.h | 2 +- devpoll.c | 2 +- epoll.c | 2 +- epoll_sub.c | 2 +- evbuffer-internal.h | 2 +- evdns.h | 2 +- event-internal.h | 2 +- event.c | 2 +- event.h | 2 +- event_iocp.c | 2 +- event_tagging.c | 2 +- evhttp.h | 2 +- evmap-internal.h | 2 +- evmap.c | 2 +- evrpc-internal.h | 2 +- evrpc.c | 2 +- evrpc.h | 2 +- evsignal-internal.h | 2 +- evthread-internal.h | 2 +- evthread.c | 2 +- evthread_pthread.c | 2 +- evthread_win32.c | 2 +- evutil.c | 2 +- evutil.h | 2 +- evutil_rand.c | 2 +- ht-internal.h | 4 ++-- http-internal.h | 2 +- http.c | 2 +- include/event2/buffer.h | 2 +- include/event2/buffer_compat.h | 2 +- include/event2/bufferevent.h | 2 +- include/event2/bufferevent_compat.h | 2 +- include/event2/bufferevent_ssl.h | 2 +- include/event2/bufferevent_struct.h | 2 +- include/event2/dns.h | 2 +- include/event2/dns_compat.h | 2 +- include/event2/dns_struct.h | 2 +- include/event2/event.h | 2 +- include/event2/event_compat.h | 2 +- include/event2/event_struct.h | 2 +- include/event2/http.h | 2 +- include/event2/http_compat.h | 2 +- include/event2/http_struct.h | 2 +- include/event2/keyvalq_struct.h | 2 +- include/event2/listener.h | 2 +- include/event2/rpc.h | 2 +- include/event2/rpc_compat.h | 2 +- include/event2/rpc_struct.h | 2 +- include/event2/tag.h | 2 +- include/event2/tag_compat.h | 2 +- include/event2/thread.h | 2 +- include/event2/util.h | 2 +- iocp-internal.h | 2 +- ipv6-internal.h | 2 +- kqueue.c | 2 +- listener.c | 2 +- log-internal.h | 2 +- log.c | 2 +- minheap-internal.h | 2 +- mm-internal.h | 2 +- poll.c | 2 +- ratelim-internal.h | 2 +- select.c | 2 +- signal.c | 2 +- test/bench.c | 2 +- test/bench_cascade.c | 2 +- test/bench_http.c | 2 +- test/bench_httpclient.c | 2 +- test/regress.c | 2 +- test/regress.h | 2 +- test/regress_buffer.c | 2 +- test/regress_bufferevent.c | 2 +- test/regress_dns.c | 2 +- test/regress_et.c | 2 +- test/regress_http.c | 2 +- test/regress_iocp.c | 2 +- test/regress_listener.c | 2 +- test/regress_main.c | 2 +- test/regress_minheap.c | 2 +- test/regress_rpc.c | 2 +- test/regress_ssl.c | 2 +- test/regress_testutils.c | 2 +- test/regress_testutils.h | 2 +- test/regress_thread.c | 2 +- test/regress_util.c | 2 +- test/regress_zlib.c | 2 +- test/test-ratelim.c | 2 +- test/tinytest.c | 2 +- test/tinytest.h | 2 +- test/tinytest_demo.c | 2 +- test/tinytest_macros.h | 2 +- util-internal.h | 2 +- win32select.c | 2 +- 105 files changed, 106 insertions(+), 106 deletions(-) diff --git a/LICENSE b/LICENSE index 5a315e47..ab553edf 100644 --- a/LICENSE +++ b/LICENSE @@ -3,7 +3,7 @@ as the 3-clause (or "modified") BSD license: ============================== Copyright (c) 2000-2007 Niels Provos -Copyright (c) 2007-2010 Niels Provos and Nick Mathewson +Copyright (c) 2007-2011 Niels Provos and Nick Mathewson Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions diff --git a/buffer.c b/buffer.c index e404f2b4..ce0cdf70 100644 --- a/buffer.c +++ b/buffer.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/buffer_iocp.c b/buffer_iocp.c index 2d3a1b17..82c44ac0 100644 --- a/buffer_iocp.c +++ b/buffer_iocp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bufferevent-internal.h b/bufferevent-internal.h index de1ff973..1b7674d3 100644 --- a/bufferevent-internal.h +++ b/bufferevent-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bufferevent.c b/bufferevent.c index 93a08015..13219f0b 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos, Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bufferevent_async.c b/bufferevent_async.c index a3b3ab1e..af5e57f5 100644 --- a/bufferevent_async.c +++ b/bufferevent_async.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * All rights reserved. * diff --git a/bufferevent_filter.c b/bufferevent_filter.c index 234204fc..d81dc759 100644 --- a/bufferevent_filter.c +++ b/bufferevent_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * Copyright (c) 2002-2006 Niels Provos * All rights reserved. * diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index 00dd6cbd..86a8619b 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bufferevent_pair.c b/bufferevent_pair.c index 38a319be..35d6b5f0 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos, Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/bufferevent_ratelim.c b/bufferevent_ratelim.c index a2205f78..98790ee1 100644 --- a/bufferevent_ratelim.c +++ b/bufferevent_ratelim.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * Copyright (c) 2002-2006 Niels Provos * All rights reserved. * diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 1dc0f330..6d27d7f8 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * Copyright (c) 2002-2006 Niels Provos * All rights reserved. * diff --git a/changelist-internal.h b/changelist-internal.h index 2bcc2289..5783fd88 100644 --- a/changelist-internal.h +++ b/changelist-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/defer-internal.h b/defer-internal.h index 8bfa8488..79a2baff 100644 --- a/defer-internal.h +++ b/defer-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/devpoll.c b/devpoll.c index 55f89d28..4c0acb25 100644 --- a/devpoll.c +++ b/devpoll.c @@ -1,6 +1,6 @@ /* * Copyright 2000-2009 Niels Provos - * Copyright 2009-2010 Niels Provos and Nick Mathewson + * Copyright 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/epoll.c b/epoll.c index 2d4aebfb..b08d78f8 100644 --- a/epoll.c +++ b/epoll.c @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2010 Niels Provos, Nick Mathewson + * Copyright 2007-2011 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/epoll_sub.c b/epoll_sub.c index 3a31e35a..466b1297 100644 --- a/epoll_sub.c +++ b/epoll_sub.c @@ -1,6 +1,6 @@ /* * Copyright 2003-2009 Niels Provos - * Copyright 2009-2010 Niels Provos and Nick Mathewson + * Copyright 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evbuffer-internal.h b/evbuffer-internal.h index 89139602..78a293a4 100644 --- a/evbuffer-internal.h +++ b/evbuffer-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evdns.h b/evdns.h index f5aa91c4..e5eb46f9 100644 --- a/evdns.h +++ b/evdns.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/event-internal.h b/event-internal.h index a8e744df..a361cf3b 100644 --- a/event-internal.h +++ b/event-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/event.c b/event.c index 1ffb7293..809a01ae 100644 --- a/event.c +++ b/event.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/event.h b/event.h index 60a003be..490d0b66 100644 --- a/event.h +++ b/event.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/event_iocp.c b/event_iocp.c index 75fe4627..de6b70b1 100644 --- a/event_iocp.c +++ b/event_iocp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos, Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/event_tagging.c b/event_tagging.c index aaded70a..e7c9e831 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2009 Niels Provos - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evhttp.h b/evhttp.h index 1707aa7f..48dda790 100644 --- a/evhttp.h +++ b/evhttp.h @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evmap-internal.h b/evmap-internal.h index b3162848..fde661d1 100644 --- a/evmap-internal.h +++ b/evmap-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evmap.c b/evmap.c index f3379988..36103a0b 100644 --- a/evmap.c +++ b/evmap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evrpc-internal.h b/evrpc-internal.h index 8497d298..d5ddfc52 100644 --- a/evrpc-internal.h +++ b/evrpc-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evrpc.c b/evrpc.c index 72f08a89..ee4606b4 100644 --- a/evrpc.c +++ b/evrpc.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evrpc.h b/evrpc.h index a9f85d7b..77216d24 100644 --- a/evrpc.h +++ b/evrpc.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evsignal-internal.h b/evsignal-internal.h index 73d1b6c7..bb49fb64 100644 --- a/evsignal-internal.h +++ b/evsignal-internal.h @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evthread-internal.h b/evthread-internal.h index fbb1c0d4..60f02e00 100644 --- a/evthread-internal.h +++ b/evthread-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2010 Niels Provos, Nick Mathewson + * Copyright (c) 2008-2011 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evthread.c b/evthread.c index 5af54dc3..24d85a85 100644 --- a/evthread.c +++ b/evthread.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2010 Niels Provos, Nick Mathewson + * Copyright (c) 2008-2011 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evthread_pthread.c b/evthread_pthread.c index 55495a6c..ffbd95ec 100644 --- a/evthread_pthread.c +++ b/evthread_pthread.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2010 Niels Provos and Nick Mathewson + * Copyright 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evthread_win32.c b/evthread_win32.c index 18dca6d4..1d383a32 100644 --- a/evthread_win32.c +++ b/evthread_win32.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2010 Niels Provos and Nick Mathewson + * Copyright 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evutil.c b/evutil.c index f9d0c8b0..71b11fe8 100644 --- a/evutil.c +++ b/evutil.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evutil.h b/evutil.h index efa2b424..53a38ff4 100644 --- a/evutil.h +++ b/evutil.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evutil_rand.c b/evutil_rand.c index d2bbd46d..a93aab0c 100644 --- a/evutil_rand.c +++ b/evutil_rand.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/ht-internal.h b/ht-internal.h index d20e14df..5116e52d 100644 --- a/ht-internal.h +++ b/ht-internal.h @@ -1,6 +1,6 @@ /* Based on work Copyright 2002 Christopher Clark */ -/* Copyright 2005-2010 Nick Mathewson */ -/* Copyright 2009-2010 Niels Provos and Nick Mathewson */ +/* Copyright 2005-2011 Nick Mathewson */ +/* Copyright 2009-2011 Niels Provos and Nick Mathewson */ /* See license at end. */ /* Based on ideas by Christopher Clark and interfaces from Niels Provos. */ diff --git a/http-internal.h b/http-internal.h index 01d29132..98e64efb 100644 --- a/http-internal.h +++ b/http-internal.h @@ -1,6 +1,6 @@ /* * Copyright 2001-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * This header file contains definitions for dealing with HTTP requests * that are internal to libevent. As user of the library, you should not diff --git a/http.c b/http.c index e5cac8d0..cc9b149a 100644 --- a/http.c +++ b/http.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/buffer.h b/include/event2/buffer.h index c53cb9c9..d28cd2dc 100644 --- a/include/event2/buffer.h +++ b/include/event2/buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/buffer_compat.h b/include/event2/buffer_compat.h index 65e1c82d..4dd1134a 100644 --- a/include/event2/buffer_compat.h +++ b/include/event2/buffer_compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/bufferevent.h b/include/event2/bufferevent.h index dac988e3..0f1ea278 100644 --- a/include/event2/bufferevent.h +++ b/include/event2/bufferevent.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/bufferevent_compat.h b/include/event2/bufferevent_compat.h index 6064a40f..5ae83ce9 100644 --- a/include/event2/bufferevent_compat.h +++ b/include/event2/bufferevent_compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos, Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos, Nick Mathewson * Copyright (c) 2000-2007 Niels Provos * All rights reserved. * diff --git a/include/event2/bufferevent_ssl.h b/include/event2/bufferevent_ssl.h index 12f00d63..bf6009a5 100644 --- a/include/event2/bufferevent_ssl.h +++ b/include/event2/bufferevent_ssl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/bufferevent_struct.h b/include/event2/bufferevent_struct.h index d4a0a067..ef0628b4 100644 --- a/include/event2/bufferevent_struct.h +++ b/include/event2/bufferevent_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/dns.h b/include/event2/dns.h index c47073c4..b938707d 100644 --- a/include/event2/dns.h +++ b/include/event2/dns.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/dns_compat.h b/include/event2/dns_compat.h index 7424c4d3..1dcca7a4 100644 --- a/include/event2/dns_compat.h +++ b/include/event2/dns_compat.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/dns_struct.h b/include/event2/dns_struct.h index 0eefd40e..b1bc7091 100644 --- a/include/event2/dns_struct.h +++ b/include/event2/dns_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/event.h b/include/event2/event.h index c487f780..6d05f341 100644 --- a/include/event2/event.h +++ b/include/event2/event.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/event_compat.h b/include/event2/event_compat.h index cb775154..02648de2 100644 --- a/include/event2/event_compat.h +++ b/include/event2/event_compat.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/event_struct.h b/include/event2/event_struct.h index d3cfb0cc..b8dd2cf0 100644 --- a/include/event2/event_struct.h +++ b/include/event2/event_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/http.h b/include/event2/http.h index f866aa3d..cb21d466 100644 --- a/include/event2/http.h +++ b/include/event2/http.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/http_compat.h b/include/event2/http_compat.h index 02a080be..2ac851b5 100644 --- a/include/event2/http_compat.h +++ b/include/event2/http_compat.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/http_struct.h b/include/event2/http_struct.h index 3545fdf5..ce616f56 100644 --- a/include/event2/http_struct.h +++ b/include/event2/http_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/keyvalq_struct.h b/include/event2/keyvalq_struct.h index 3390dd15..15874503 100644 --- a/include/event2/keyvalq_struct.h +++ b/include/event2/keyvalq_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/listener.h b/include/event2/listener.h index 0cb8583c..9b4b7676 100644 --- a/include/event2/listener.h +++ b/include/event2/listener.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/rpc.h b/include/event2/rpc.h index 66a2612e..06a5e85c 100644 --- a/include/event2/rpc.h +++ b/include/event2/rpc.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/rpc_compat.h b/include/event2/rpc_compat.h index 1f3b3a1f..d07b3ecc 100644 --- a/include/event2/rpc_compat.h +++ b/include/event2/rpc_compat.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/rpc_struct.h b/include/event2/rpc_struct.h index 1345fb74..de4d5b0f 100644 --- a/include/event2/rpc_struct.h +++ b/include/event2/rpc_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/tag.h b/include/event2/tag.h index 54ce8c65..7344daa6 100644 --- a/include/event2/tag.h +++ b/include/event2/tag.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/tag_compat.h b/include/event2/tag_compat.h index 8a47e8a3..dd4e796a 100644 --- a/include/event2/tag_compat.h +++ b/include/event2/tag_compat.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/thread.h b/include/event2/thread.h index 2cf11aa8..bfe91fae 100644 --- a/include/event2/thread.h +++ b/include/event2/thread.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/util.h b/include/event2/util.h index 67fa809f..882e7afb 100644 --- a/include/event2/util.h +++ b/include/event2/util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/iocp-internal.h b/iocp-internal.h index eb2eae49..f8462556 100644 --- a/iocp-internal.h +++ b/iocp-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/ipv6-internal.h b/ipv6-internal.h index 1f272a0d..c5d1d522 100644 --- a/ipv6-internal.h +++ b/ipv6-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/kqueue.c b/kqueue.c index 2e8b1724..597eb4c6 100644 --- a/kqueue.c +++ b/kqueue.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/listener.c b/listener.c index 5db2cb73..a440f465 100644 --- a/listener.c +++ b/listener.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos, Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/log-internal.h b/log-internal.h index c1905aea..52590c26 100644 --- a/log-internal.h +++ b/log-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/log.c b/log.c index f0cd4320..4367c0b2 100644 --- a/log.c +++ b/log.c @@ -5,7 +5,7 @@ * * Based on err.c, which was adapted from OpenBSD libc *err* *warn* code. * - * Copyright (c) 2005-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2005-2011 Niels Provos and Nick Mathewson * * Copyright (c) 2000 Dug Song * diff --git a/minheap-internal.h b/minheap-internal.h index 9734a7c7..e64f8555 100644 --- a/minheap-internal.h +++ b/minheap-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Copyright (c) 2006 Maxim Yegorushkin * diff --git a/mm-internal.h b/mm-internal.h index 79855d6a..b9168a1f 100644 --- a/mm-internal.h +++ b/mm-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/poll.c b/poll.c index 63f23886..b8217f67 100644 --- a/poll.c +++ b/poll.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/ratelim-internal.h b/ratelim-internal.h index df75f868..29e1b54f 100644 --- a/ratelim-internal.h +++ b/ratelim-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/select.c b/select.c index 332434d3..d9279829 100644 --- a/select.c +++ b/select.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/signal.c b/signal.c index e142a4dd..5cf3ce4f 100644 --- a/signal.c +++ b/signal.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/bench.c b/test/bench.c index d0f831b9..647f9065 100644 --- a/test/bench.c +++ b/test/bench.c @@ -1,6 +1,6 @@ /* * Copyright 2003-2007 Niels Provos - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/bench_cascade.c b/test/bench_cascade.c index c25255ed..36c226e6 100644 --- a/test/bench_cascade.c +++ b/test/bench_cascade.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/bench_http.c b/test/bench_http.c index 8180b267..8e60a219 100644 --- a/test/bench_http.c +++ b/test/bench_http.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2010 Niels Provos and Nick Mathewson + * Copyright 2008-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/bench_httpclient.c b/test/bench_httpclient.c index 25db4a7d..1b73e309 100644 --- a/test/bench_httpclient.c +++ b/test/bench_httpclient.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2010 Niels Provos and Nick Mathewson + * Copyright 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress.c b/test/regress.c index 22e110f6..683303db 100644 --- a/test/regress.c +++ b/test/regress.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress.h b/test/regress.h index 3cbd7cd2..23b3d313 100644 --- a/test/regress.h +++ b/test/regress.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_buffer.c b/test/regress_buffer.c index e6b8dfcb..e68b24fe 100644 --- a/test/regress_buffer.c +++ b/test/regress_buffer.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_bufferevent.c b/test/regress_bufferevent.c index d737b48d..e71288e8 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_dns.c b/test/regress_dns.c index 9f694fbf..512d58b5 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_et.c b/test/regress_et.c index 9da53fdb..7b2d94a8 100644 --- a/test/regress_et.c +++ b/test/regress_et.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_http.c b/test/regress_http.c index 0aef4d74..e9336275 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_iocp.c b/test/regress_iocp.c index 60b93304..5d95a9bf 100644 --- a/test/regress_iocp.c +++ b/test/regress_iocp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_listener.c b/test/regress_listener.c index 44fee7f4..ab4fad27 100644 --- a/test/regress_listener.c +++ b/test/regress_listener.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_main.c b/test/regress_main.c index e8b2af94..d129d7c2 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_minheap.c b/test/regress_minheap.c index 6c00c5b8..7e5522f7 100644 --- a/test/regress_minheap.c +++ b/test/regress_minheap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_rpc.c b/test/regress_rpc.c index 94a96f2b..1b7bc2e1 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_ssl.c b/test/regress_ssl.c index 6bc5f320..7f714106 100644 --- a/test/regress_ssl.c +++ b/test/regress_ssl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_testutils.c b/test/regress_testutils.c index dfce2bba..efc1ff5f 100644 --- a/test/regress_testutils.c +++ b/test/regress_testutils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Niels Provos and Nick Mathewson + * Copyright (c) 2010-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_testutils.h b/test/regress_testutils.h index 7f2936aa..4aa06402 100644 --- a/test/regress_testutils.h +++ b/test/regress_testutils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010 Niels Provos and Nick Mathewson + * Copyright (c) 2010-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_thread.c b/test/regress_thread.c index cbc1efef..8a3e6a9e 100644 --- a/test/regress_thread.c +++ b/test/regress_thread.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_util.c b/test/regress_util.c index effbcc2b..f679a8a6 100644 --- a/test/regress_util.c +++ b/test/regress_util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Nick Mathewson and Niels Provos + * Copyright (c) 2009-2011 Nick Mathewson and Niels Provos * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/regress_zlib.c b/test/regress_zlib.c index 6dd7bf8f..7dde48f2 100644 --- a/test/regress_zlib.c +++ b/test/regress_zlib.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/test-ratelim.c b/test/test-ratelim.c index 473cfc5f..a07678af 100644 --- a/test/test-ratelim.c +++ b/test/test-ratelim.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/tinytest.c b/test/tinytest.c index 76376de0..16b12857 100644 --- a/test/tinytest.c +++ b/test/tinytest.c @@ -1,4 +1,4 @@ -/* tinytest.c -- Copyright 2009-2010 Nick Mathewson +/* tinytest.c -- Copyright 2009-2011 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/tinytest.h b/test/tinytest.h index cbe28b7f..321a4c76 100644 --- a/test/tinytest.h +++ b/test/tinytest.h @@ -1,4 +1,4 @@ -/* tinytest.h -- Copyright 2009-2010 Nick Mathewson +/* tinytest.h -- Copyright 2009-2011 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/tinytest_demo.c b/test/tinytest_demo.c index 8838459b..8b7b3c51 100644 --- a/test/tinytest_demo.c +++ b/test/tinytest_demo.c @@ -1,4 +1,4 @@ -/* tinytest_demo.c -- Copyright 2009-2010 Nick Mathewson +/* tinytest_demo.c -- Copyright 2009-2011 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/tinytest_macros.h b/test/tinytest_macros.h index 032393cc..d636b4f2 100644 --- a/test/tinytest_macros.h +++ b/test/tinytest_macros.h @@ -1,4 +1,4 @@ -/* tinytest_macros.h -- Copyright 2009-2010 Nick Mathewson +/* tinytest_macros.h -- Copyright 2009-2011 Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/util-internal.h b/util-internal.h index 2b4437f9..541d45fb 100644 --- a/util-internal.h +++ b/util-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/win32select.c b/win32select.c index 70e7e6e8..2e0910bd 100644 --- a/win32select.c +++ b/win32select.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2010 Niels Provos and Nick Mathewson + * Copyright 2007-2011 Niels Provos and Nick Mathewson * Copyright 2000-2007 Niels Provos * Copyright 2003 Michael A. Davis * From 1aee718362f8bc88369d750bdb87b4f8af48af28 Mon Sep 17 00:00:00 2001 From: Jamie Iles Date: Wed, 26 Oct 2011 13:24:30 +0100 Subject: [PATCH 2/2] epoll: close fd on alloc fail at initialization If the memory allocations fail then we free any other allocated structures but don't close the file descriptor resulting in an leak of fd's. --- epoll.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/epoll.c b/epoll.c index b08d78f8..b5dd1309 100644 --- a/epoll.c +++ b/epoll.c @@ -120,8 +120,10 @@ epoll_init(struct event_base *base) evutil_make_socket_closeonexec(epfd); - if (!(epollop = mm_calloc(1, sizeof(struct epollop)))) + if (!(epollop = mm_calloc(1, sizeof(struct epollop)))) { + close(epfd); return (NULL); + } epollop->epfd = epfd; @@ -129,6 +131,7 @@ epoll_init(struct event_base *base) epollop->events = mm_calloc(INITIAL_NEVENT, sizeof(struct epoll_event)); if (epollop->events == NULL) { mm_free(epollop); + close(epfd); return (NULL); } epollop->nevents = INITIAL_NEVENT;