From e49e2891292ee84e08c319bc5031fe607efc4245 Mon Sep 17 00:00:00 2001 From: Nick Mathewson Date: Fri, 10 Feb 2012 17:29:53 -0500 Subject: Update copyright notices to 2012 --- LICENSE | 2 +- Makefile.am | 6 ++++++ arc4random.c | 1 + 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 +- configure.in | 8 +++++++- defer-internal.h | 2 +- devpoll.c | 2 +- epoll.c | 2 +- epoll_sub.c | 2 +- evbuffer-internal.h | 2 +- evdns.c | 36 +++++++++++++++++++++++++----------- evdns.h | 2 +- event-internal.h | 2 +- event.c | 2 +- event.h | 2 +- event_iocp.c | 2 +- event_rpcgen.py | 3 ++- event_tagging.c | 2 +- evhttp.h | 2 +- evmap-internal.h | 2 +- evmap.c | 2 +- evport.c | 3 +++ 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/Makefile.am | 6 ++++++ 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 +- sample/Makefile.am | 6 ++++++ select.c | 2 +- signal.c | 2 +- test/Makefile.am | 6 ++++++ 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-changelist.c | 24 +++++++++++++++++++++++- test/test-eof.c | 26 ++++++++++++++++++++++++-- test/test-init.c | 26 ++++++++++++++++++++++++-- test/test-ratelim.c | 2 +- test/test-time.c | 26 ++++++++++++++++++++++++-- test/test-weof.c | 26 ++++++++++++++++++++++++-- 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 +- 119 files changed, 287 insertions(+), 128 deletions(-) diff --git a/LICENSE b/LICENSE index ab553edf..70d76b3d 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-2011 Niels Provos and Nick Mathewson +Copyright (c) 2007-2012 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/Makefile.am b/Makefile.am index dc7905e3..1cc7f812 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,9 @@ +# Makefile.am for libevent +# Copyright 2000-2007 Niels Provos +# Copyright 2007-2012 Niels Provos and Nick Mathewson +# +# See LICENSE for copying information. + # 'foreign' means that we're not enforcing GNU package rules strictly. # '1.7' means that we need automake 1.7 or later (and we do). AUTOMAKE_OPTIONS = foreign 1.7 diff --git a/arc4random.c b/arc4random.c index ef10fa8d..ee2b73a2 100644 --- a/arc4random.c +++ b/arc4random.c @@ -1,6 +1,7 @@ /* Portable arc4random.c based on arc4random.c from OpenBSD. * Portable version by Chris Davis, adapted for Libevent by Nick Mathewson * Copyright (c) 2010 Chris Davis, Niels Provos, and Nick Mathewson + * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson * * Note that in Libevent, this file isn't compiled directly. Instead, * it's included from evutil_rand.c diff --git a/buffer.c b/buffer.c index d048a622..ff64aede 100644 --- a/buffer.c +++ b/buffer.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 82c44ac0..5d5303eb 100644 --- a/buffer_iocp.c +++ b/buffer_iocp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 1b7674d3..8348ab7a 100644 --- a/bufferevent-internal.h +++ b/bufferevent-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2008-2012 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 13219f0b..45a1437e 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2007-2012 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 af5e57f5..f34ca5f1 100644 --- a/bufferevent_async.c +++ b/bufferevent_async.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson * * All rights reserved. * diff --git a/bufferevent_filter.c b/bufferevent_filter.c index d81dc759..557f8cce 100644 --- a/bufferevent_filter.c +++ b/bufferevent_filter.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 ea9d0d65..412c08e5 100644 --- a/bufferevent_openssl.c +++ b/bufferevent_openssl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 35d6b5f0..6ec5cac8 100644 --- a/bufferevent_pair.c +++ b/bufferevent_pair.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2009-2012 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 98790ee1..7965390e 100644 --- a/bufferevent_ratelim.c +++ b/bufferevent_ratelim.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 964e0b2a..9050eda2 100644 --- a/bufferevent_sock.c +++ b/bufferevent_sock.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 5783fd88..6ed432a2 100644 --- a/changelist-internal.h +++ b/changelist-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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/configure.in b/configure.in index c6cd23dc..d61390bd 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,11 @@ dnl configure.in for libevent -dnl Dug Song +dnl Copyright 2000-2007 Niels Provos +dnl Copyright 2007-2012 Niels Provos and Nick Mathewson +dnl +dnl See LICENSE for copying information. +dnl +dnl Original version Dug Song + AC_PREREQ(2.59c) AC_INIT(event.c) diff --git a/defer-internal.h b/defer-internal.h index 79a2baff..96a5cacc 100644 --- a/defer-internal.h +++ b/defer-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 4c0acb25..0c7214b7 100644 --- a/devpoll.c +++ b/devpoll.c @@ -1,6 +1,6 @@ /* * Copyright 2000-2009 Niels Provos - * Copyright 2009-2011 Niels Provos and Nick Mathewson + * Copyright 2009-2012 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 b5dd1309..4c5c3da0 100644 --- a/epoll.c +++ b/epoll.c @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2011 Niels Provos, Nick Mathewson + * Copyright 2007-2012 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 466b1297..3738b26b 100644 --- a/epoll_sub.c +++ b/epoll_sub.c @@ -1,6 +1,6 @@ /* * Copyright 2003-2009 Niels Provos - * Copyright 2009-2011 Niels Provos and Nick Mathewson + * Copyright 2009-2012 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 78a293a4..e68a59df 100644 --- a/evbuffer-internal.h +++ b/evbuffer-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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.c b/evdns.c index 106ac6de..b447fd91 100644 --- a/evdns.c +++ b/evdns.c @@ -1,18 +1,32 @@ -/* $Id: evdns.c 6979 2006-08-04 18:31:13Z nickm $ */ - -/* The original version of this module was written by Adam Langley; for - * a history of modifications, check out the subversion logs. +/* Copyright 2006-2007 Niels Provos + * Copyright 2007-2012 Nick Mathewson and Niels Provos * - * When editing this module, try to keep it re-mergeable by Adam. Don't - * reformat the whitespace, add Tor dependencies, or so on. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. * - * TODO: - * - Support IPv6 and PTR records. - * - Replace all externally visible magic numbers with #defined constants. - * - Write documentation for APIs of all external functions. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* Async DNS Library +/* Based on software by Adam Langly. Adam's original message: + * + * Async DNS Library * Adam Langley * http://www.imperialviolet.org/eventdns.html * Public Domain code diff --git a/evdns.h b/evdns.h index 8490d8c5..513f9b70 100644 --- a/evdns.h +++ b/evdns.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 43beaf3b..1798b702 100644 --- a/event-internal.h +++ b/event-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 b2e96451..f13cdcf1 100644 --- a/event.c +++ b/event.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 490d0b66..a3785b98 100644 --- a/event.h +++ b/event.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 12994222..43212810 100644 --- a/event_iocp.c +++ b/event_iocp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2009-2012 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_rpcgen.py b/event_rpcgen.py index 64c81de5..e051aa9d 100755 --- a/event_rpcgen.py +++ b/event_rpcgen.py @@ -1,6 +1,7 @@ #!/usr/bin/env python # -# Copyright (c) 2005 Niels Provos +# Copyright (c) 2005-2007 Niels Provos +# Copyright (c) 2007-2012 Niels Provos and Nick Mathewson # All rights reserved. # # Generates marshaling code based on libevent. diff --git a/event_tagging.c b/event_tagging.c index e7c9e831..a83e719f 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2009 Niels Provos - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 3612a775..5ce15e65 100644 --- a/evhttp.h +++ b/evhttp.h @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 8bf655fd..23b5a8a0 100644 --- a/evmap-internal.h +++ b/evmap-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 e3ee403d..69c1067d 100644 --- a/evmap.c +++ b/evmap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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/evport.c b/evport.c index f1da73d5..0d714d81 100644 --- a/evport.c +++ b/evport.c @@ -1,6 +1,9 @@ /* * Submitted by David Pacheco (dp.spambait@gmail.com) * + * Copyright 2006-2007 Niels Provos + * Copyright 2007-2012 Niels Provos and Nick Mathewson + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: diff --git a/evrpc-internal.h b/evrpc-internal.h index d5ddfc52..d6ea41a7 100644 --- a/evrpc-internal.h +++ b/evrpc-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 ee4606b4..4bf3d2b4 100644 --- a/evrpc.c +++ b/evrpc.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 6ec5912c..5b88262d 100644 --- a/evrpc.h +++ b/evrpc.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 bb49fb64..426f4a4d 100644 --- a/evsignal-internal.h +++ b/evsignal-internal.h @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 65d30f8b..ccfcdde8 100644 --- a/evthread-internal.h +++ b/evthread-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2008-2012 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 765d7346..90e195d5 100644 --- a/evthread.c +++ b/evthread.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2008-2012 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 ffbd95ec..c4d06ea5 100644 --- a/evthread_pthread.c +++ b/evthread_pthread.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2011 Niels Provos and Nick Mathewson + * Copyright 2009-2012 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 1d383a32..2389d721 100644 --- a/evthread_win32.c +++ b/evthread_win32.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2011 Niels Provos and Nick Mathewson + * Copyright 2009-2012 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 71b11fe8..56c99097 100644 --- a/evutil.c +++ b/evutil.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 53a38ff4..02bca89e 100644 --- a/evutil.h +++ b/evutil.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 a93aab0c..3cc163d3 100644 --- a/evutil_rand.c +++ b/evutil_rand.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 5116e52d..46738251 100644 --- a/ht-internal.h +++ b/ht-internal.h @@ -1,6 +1,6 @@ /* Based on work Copyright 2002 Christopher Clark */ -/* Copyright 2005-2011 Nick Mathewson */ -/* Copyright 2009-2011 Niels Provos and Nick Mathewson */ +/* Copyright 2005-2012 Nick Mathewson */ +/* Copyright 2009-2012 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 98e64efb..5f66673e 100644 --- a/http-internal.h +++ b/http-internal.h @@ -1,6 +1,6 @@ /* * Copyright 2001-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 a234187a..b9687df6 100644 --- a/http.c +++ b/http.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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/Makefile.am b/include/Makefile.am index fbf459eb..5153db27 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -1,3 +1,9 @@ +# include/Makefile.am for libevent +# Copyright 2000-2007 Niels Provos +# Copyright 2007-2012 Niels Provos and Nick Mathewson +# +# See LICENSE for copying information. + AUTOMAKE_OPTIONS = foreign EVENT2_EXPORT = \ diff --git a/include/event2/buffer.h b/include/event2/buffer.h index 32963568..16236c4b 100644 --- a/include/event2/buffer.h +++ b/include/event2/buffer.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 4dd1134a..a713ee32 100644 --- a/include/event2/buffer_compat.h +++ b/include/event2/buffer_compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 0f1ea278..f3d8b1a0 100644 --- a/include/event2/bufferevent.h +++ b/include/event2/bufferevent.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 5ae83ce9..3256fd16 100644 --- a/include/event2/bufferevent_compat.h +++ b/include/event2/bufferevent_compat.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2007-2012 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 bf6009a5..c612e99e 100644 --- a/include/event2/bufferevent_ssl.h +++ b/include/event2/bufferevent_ssl.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 ef0628b4..02835c16 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 b938707d..ca0da3c9 100644 --- a/include/event2/dns.h +++ b/include/event2/dns.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 1dcca7a4..7c1c7761 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 b1bc7091..5a02a0bd 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 6d05f341..39937072 100644 --- a/include/event2/event.h +++ b/include/event2/event.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 02648de2..14a10e9e 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 b8dd2cf0..2ed4272c 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 d9f806e0..c6ee1dbe 100644 --- a/include/event2/http.h +++ b/include/event2/http.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 2ac851b5..9e902a4b 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 ce616f56..41a92a9f 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 15874503..ab8040bf 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 9b4b7676..2dc64be4 100644 --- a/include/event2/listener.h +++ b/include/event2/listener.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 06a5e85c..5272edc2 100644 --- a/include/event2/rpc.h +++ b/include/event2/rpc.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 d07b3ecc..a4e24bb6 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 de4d5b0f..c339ae58 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 7344daa6..9e51779e 100644 --- a/include/event2/tag.h +++ b/include/event2/tag.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 dd4e796a..73c19330 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 bfe91fae..0b638f0f 100644 --- a/include/event2/thread.h +++ b/include/event2/thread.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2008-2012 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 882e7afb..45d8f1de 100644 --- a/include/event2/util.h +++ b/include/event2/util.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 f8462556..ae79cbc7 100644 --- a/iocp-internal.h +++ b/iocp-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 c5d1d522..e3737118 100644 --- a/ipv6-internal.h +++ b/ipv6-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 81ae84e1..8276f047 100644 --- a/kqueue.c +++ b/kqueue.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 8dcbb0b3..9941e1d8 100644 --- a/listener.c +++ b/listener.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos, Nick Mathewson + * Copyright (c) 2009-2012 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 52590c26..211b3e1d 100644 --- a/log-internal.h +++ b/log-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 4367c0b2..046e81f9 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-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2005-2012 Niels Provos and Nick Mathewson * * Copyright (c) 2000 Dug Song * diff --git a/minheap-internal.h b/minheap-internal.h index e64f8555..6d8e80a2 100644 --- a/minheap-internal.h +++ b/minheap-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson * * Copyright (c) 2006 Maxim Yegorushkin * diff --git a/mm-internal.h b/mm-internal.h index b9168a1f..b375155d 100644 --- a/mm-internal.h +++ b/mm-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 b8217f67..04d311bb 100644 --- a/poll.c +++ b/poll.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 29e1b54f..4e3f8c4c 100644 --- a/ratelim-internal.h +++ b/ratelim-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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/sample/Makefile.am b/sample/Makefile.am index 6a148148..234feb40 100644 --- a/sample/Makefile.am +++ b/sample/Makefile.am @@ -1,3 +1,9 @@ +# sample/Makefile.am for libevent +# Copyright 2000-2007 Niels Provos +# Copyright 2007-2012 Niels Provos and Nick Mathewson +# +# See LICENSE for copying information. + AUTOMAKE_OPTIONS = foreign no-dependencies LDADD = $(LIBEVENT_GC_SECTIONS) ../libevent.la diff --git a/select.c b/select.c index d9279829..afba6d34 100644 --- a/select.c +++ b/select.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 5cf3ce4f..d40da0e3 100644 --- a/signal.c +++ b/signal.c @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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/Makefile.am b/test/Makefile.am index 1fdf0268..1beb51d8 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -1,3 +1,9 @@ +# test/Makefile.am for libevent +# Copyright 2000-2007 Niels Provos +# Copyright 2007-2012 Niels Provos and Nick Mathewson +# +# See LICENSE for copying information. + AUTOMAKE_OPTIONS = foreign AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/compat -I$(top_srcdir)/include -I../include -DTINYTEST_LOCAL diff --git a/test/bench.c b/test/bench.c index 647f9065..66b7d719 100644 --- a/test/bench.c +++ b/test/bench.c @@ -1,6 +1,6 @@ /* * Copyright 2003-2007 Niels Provos - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 36c226e6..08b7f945 100644 --- a/test/bench_cascade.c +++ b/test/bench_cascade.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 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 8e60a219..f6fd81b2 100644 --- a/test/bench_http.c +++ b/test/bench_http.c @@ -1,5 +1,5 @@ /* - * Copyright 2008-2011 Niels Provos and Nick Mathewson + * Copyright 2008-2012 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 1b73e309..cf667534 100644 --- a/test/bench_httpclient.c +++ b/test/bench_httpclient.c @@ -1,5 +1,5 @@ /* - * Copyright 2009-2011 Niels Provos and Nick Mathewson + * Copyright 2009-2012 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 6ad332e1..2d48583d 100644 --- a/test/regress.c +++ b/test/regress.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 23b3d313..32adccdf 100644 --- a/test/regress.h +++ b/test/regress.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 addd5f9a..6a2b6fcc 100644 --- a/test/regress_buffer.c +++ b/test/regress_buffer.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 e71288e8..2a7097ce 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 5743dc7c..a566469b 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 32c7fb6b..dee7b936 100644 --- a/test/regress_et.c +++ b/test/regress_et.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 e9336275..aea318f4 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 5d95a9bf..916d3223 100644 --- a/test/regress_iocp.c +++ b/test/regress_iocp.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 ab4fad27..f6c22cb0 100644 --- a/test/regress_listener.c +++ b/test/regress_listener.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 43c2d333..42a0366a 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 7e5522f7..049d22a0 100644 --- a/test/regress_minheap.c +++ b/test/regress_minheap.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 1b7bc2e1..922fdc10 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 7f714106..a2b7f05b 100644 --- a/test/regress_ssl.c +++ b/test/regress_ssl.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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 efc1ff5f..9b3046e0 100644 --- a/test/regress_testutils.c +++ b/test/regress_testutils.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2010-2012 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 4aa06402..1f09427d 100644 --- a/test/regress_testutils.h +++ b/test/regress_testutils.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2010-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2010-2012 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 8a3e6a9e..1acf6824 100644 --- a/test/regress_thread.c +++ b/test/regress_thread.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 f679a8a6..88d80577 100644 --- a/test/regress_util.c +++ b/test/regress_util.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Nick Mathewson and Niels Provos + * Copyright (c) 2009-2012 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 7dde48f2..887a6853 100644 --- a/test/regress_zlib.c +++ b/test/regress_zlib.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2008-2012 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-changelist.c b/test/test-changelist.c index f368f1cb..fae099c7 100644 --- a/test/test-changelist.c +++ b/test/test-changelist.c @@ -1,5 +1,27 @@ /* - * based on test-eof.c + * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "event2/event-config.h" diff --git a/test/test-eof.c b/test/test-eof.c index 417476e8..3f470ce2 100644 --- a/test/test-eof.c +++ b/test/test-eof.c @@ -1,6 +1,28 @@ /* - * Compile with: - * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent + * Copyright (c) 2002-2007 Niels Provos + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "event2/event-config.h" diff --git a/test/test-init.c b/test/test-init.c index 967a0131..2dfa865c 100644 --- a/test/test-init.c +++ b/test/test-init.c @@ -1,6 +1,28 @@ /* - * Compile with: - * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent + * Copyright (c) 2003-2007 Niels Provos + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "event2/event-config.h" diff --git a/test/test-ratelim.c b/test/test-ratelim.c index a07678af..eb0b1654 100644 --- a/test/test-ratelim.c +++ b/test/test-ratelim.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2009-2012 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-time.c b/test/test-time.c index 5628696e..8f0bd628 100644 --- a/test/test-time.c +++ b/test/test-time.c @@ -1,6 +1,28 @@ /* - * Compile with: - * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent + * Copyright (c) 2002-2007 Niels Provos + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "event2/event-config.h" diff --git a/test/test-weof.c b/test/test-weof.c index b20f27e1..dfdd3f04 100644 --- a/test/test-weof.c +++ b/test/test-weof.c @@ -1,6 +1,28 @@ /* - * Compile with: - * cc -I/usr/local/include -o time-test time-test.c -L/usr/local/lib -levent + * Copyright (c) 2002-2007 Niels Provos + * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. The name of the author may not be used to endorse or promote products + * derived from this software without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ #include "event2/event-config.h" diff --git a/test/tinytest.c b/test/tinytest.c index 16b12857..91cd8cb1 100644 --- a/test/tinytest.c +++ b/test/tinytest.c @@ -1,4 +1,4 @@ -/* tinytest.c -- Copyright 2009-2011 Nick Mathewson +/* tinytest.c -- Copyright 2009-2012 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 321a4c76..7ce7858e 100644 --- a/test/tinytest.h +++ b/test/tinytest.h @@ -1,4 +1,4 @@ -/* tinytest.h -- Copyright 2009-2011 Nick Mathewson +/* tinytest.h -- Copyright 2009-2012 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 8b7b3c51..2a999bee 100644 --- a/test/tinytest_demo.c +++ b/test/tinytest_demo.c @@ -1,4 +1,4 @@ -/* tinytest_demo.c -- Copyright 2009-2011 Nick Mathewson +/* tinytest_demo.c -- Copyright 2009-2012 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 d636b4f2..1a07ad14 100644 --- a/test/tinytest_macros.h +++ b/test/tinytest_macros.h @@ -1,4 +1,4 @@ -/* tinytest_macros.h -- Copyright 2009-2011 Nick Mathewson +/* tinytest_macros.h -- Copyright 2009-2012 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 541d45fb..d51bc000 100644 --- a/util-internal.h +++ b/util-internal.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson + * Copyright (c) 2007-2012 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 2e0910bd..46c32c34 100644 --- a/win32select.c +++ b/win32select.c @@ -1,5 +1,5 @@ /* - * Copyright 2007-2011 Niels Provos and Nick Mathewson + * Copyright 2007-2012 Niels Provos and Nick Mathewson * Copyright 2000-2007 Niels Provos * Copyright 2003 Michael A. Davis * -- cgit v1.2.1