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 5a315e47ff..ab553edff1 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 e404f2b4f1..ce0cdf7062 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 2d3a1b17c5..82c44ac07a 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 de1ff973ad..1b7674d383 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 93a08015f2..13219f0b00 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 a3b3ab1e4a..af5e57f565 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 234204fc00..d81dc759ef 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 00dd6cbde7..86a8619b0c 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 38a319be04..35d6b5f068 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 a2205f78ac..98790ee101 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 1dc0f33006..6d27d7f8f7 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 2bcc228921..5783fd8873 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 8bfa848898..79a2baff4e 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 55f89d2822..4c0acb25e8 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 2d4aebfbdd..b08d78f8f4 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 3a31e35ad1..466b129723 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 89139602c7..78a293a48a 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 f5aa91c40e..e5eb46f9ac 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 a8e744df72..a361cf3b6e 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 1ffb729369..809a01aef3 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 60a003beee..490d0b667f 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 75fe4627eb..de6b70b1b7 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 aaded70a36..e7c9e8312e 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 1707aa7f08..48dda7909b 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 b31628489c..fde661d136 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 f33799882f..36103a0bb4 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 8497d29882..d5ddfc528d 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 72f08a89ae..ee4606b451 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 a9f85d7b3f..77216d24cd 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 73d1b6c799..bb49fb64b9 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 fbb1c0d47c..60f02e00fe 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 5af54dc3e2..24d85a856c 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 55495a6ca3..ffbd95ec70 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 18dca6d439..1d383a32bc 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 f9d0c8b0fb..71b11fe8c4 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 efa2b4241b..53a38ff42b 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 d2bbd46d32..a93aab0ceb 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 d20e14df82..5116e52d4e 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 01d29132aa..98e64efba6 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 e5cac8d0e7..cc9b149a5c 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 c53cb9c9e0..d28cd2dcca 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 65e1c82d92..4dd1134a2d 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 dac988e33e..0f1ea278c2 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 6064a40fe6..5ae83ce9d1 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 12f00d6368..bf6009a5f6 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 d4a0a06727..ef0628b442 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 c47073c4c1..b938707d9b 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 7424c4d336..1dcca7a43f 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 0eefd40e91..b1bc70912e 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 c487f78088..6d05f341ce 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 cb77515400..02648de246 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 d3cfb0cca9..b8dd2cf021 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 f866aa3d93..cb21d46683 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 02a080beb7..2ac851b535 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 3545fdf5b9..ce616f56a3 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 3390dd1538..158745038c 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 0cb8583ccd..9b4b76760b 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 66a2612e63..06a5e85ca2 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 1f3b3a1fd5..d07b3eccd9 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 1345fb7430..de4d5b0f90 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 54ce8c6582..7344daa6c1 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 8a47e8a38c..dd4e796afe 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 2cf11aa8e9..bfe91fae3a 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 67fa809f16..882e7afb17 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 eb2eae49c2..f84625569d 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 1f272a0d0c..c5d1d52241 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 2e8b17246b..597eb4c65b 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 5db2cb733b..a440f46508 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 c1905aea34..52590c26d8 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 f0cd4320d1..4367c0b2d6 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 9734a7c72d..e64f855517 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 79855d6a05..b9168a1f14 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 63f238868e..b8217f6739 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 df75f8688d..29e1b54f39 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 332434d3a2..d9279829d6 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 e142a4dddc..5cf3ce4f5f 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 d0f831b9f8..647f9065bd 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 c25255edd2..36c226e68c 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 8180b267f2..8e60a21997 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 25db4a7d8c..1b73e30905 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 22e110f6ef..683303db10 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 3cbd7cd2f7..23b3d31305 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 e6b8dfcb9e..e68b24fe62 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 d737b48d78..e71288e817 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 9f694fbf48..512d58b53d 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 9da53fdb1b..7b2d94a87e 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 0aef4d7405..e9336275b0 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 60b9330435..5d95a9bf9f 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 44fee7f4c5..ab4fad2726 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 e8b2af9443..d129d7c273 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 6c00c5b85f..7e5522f748 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 94a96f2bd0..1b7bc2e1e4 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 6bc5f32085..7f71410642 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 dfce2bba3e..efc1ff5f5d 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 7f2936aabb..4aa06402fe 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 cbc1efef4e..8a3e6a9e00 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 effbcc2b75..f679a8a60d 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 6dd7bf8f61..7dde48f2ca 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 473cfc5fc4..a07678af14 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 76376de09f..16b128571a 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 cbe28b7f51..321a4c7675 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 8838459bd6..8b7b3c51b5 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 032393ccf7..d636b4f246 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 2b4437f973..541d45fb7c 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 70e7e6e8bc..2e0910bdce 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 b08d78f8f4..b5dd1309a4 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;