diff --git a/LICENSE b/LICENSE index ab553edff1..70d76b3d3b 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 8f0907f466..47ebf19914 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 @@ -49,6 +55,9 @@ VERSION_INFO = 1:0:0 # 2.0.12-stable-- 2.0 6:1:1 (No ABI change) # 2.0.13-stable-- 2.0 6:2:1 (No ABI change) # 2.0.14-stable-- 2.0 6:3:1 (No ABI change) +# 2.0.15-stable-- 2.0 6:3:1 (Forgot to update :( ) +# 2.0.16-stable-- 2.0 6:4:1 (No ABI change) +# 2.0.17-stable-- 2.0 6:5:1 (No ABI change) # # For Libevent 2.1: # 2.1.1-alpha -- 2.1 1:0:0 diff --git a/WIN32-Code/event2/event-config.h b/WIN32-Code/event2/event-config.h index 93b590a93b..f2ea1fcb98 100644 --- a/WIN32-Code/event2/event-config.h +++ b/WIN32-Code/event2/event-config.h @@ -334,7 +334,13 @@ #define _EVENT_TIME_WITH_SYS_TIME 1 /* Version number of package */ +<<<<<<< HEAD #define _EVENT_VERSION "2.1.0-alpha-dev" +||||||| merged common ancestors +#define _EVENT_VERSION "2.0.16-stable-dev" +======= +#define _EVENT_VERSION "2.0.17-stable" +>>>>>>> origin/patches-2.0 /* Define to appropriate substitue if compiler doesnt have __func__ */ #define _EVENT___func__ __FUNCTION__ diff --git a/arc4random.c b/arc4random.c index fc2c97bcea..31f3842fb5 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 36a88fa54c..00035745a1 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 1d98101594..7d5f230dd6 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 c158013923..e442e16881 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 8cd32dcc70..9879970497 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 b8f734961a..b28e4b6298 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 7b54147f4e..bc70f8eb98 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 e89a74d4a0..090927daf0 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 271e305d37..6d370733eb 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 44d18129c7..405864738a 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 6bf8d197c6..bf9e35e05f 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 5783fd8873..6ed432a26f 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 b60669baef..0e2770feee 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,10 @@ -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.59) AC_INIT(event.c) diff --git a/defer-internal.h b/defer-internal.h index a413327bb4..d8443925a2 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 aeb97ae92c..c3f389f519 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 f1219e7dfb..69d028850b 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 f647140665..af35daa7f2 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 51806497ac..bdbde89e6e 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 f2869be585..d06971e22f 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 8490d8c522..513f9b70e8 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 754ef75944..1b6421db82 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 1b5263f4fb..8b6a0da71a 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 4cabd25b82..45250b379c 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 d9610b67de..0849c8ece0 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 64c81de5b0..e051aa9d4e 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 d646ae3da2..6bd922bbb5 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 3612a77506..5ce15e6552 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 64269545b1..fd8426761d 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 219656079c..2d7fb9db82 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 50f065a65c..511f8d6894 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 d5ddfc528d..d6ea41a757 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 97b231c03a..03bd375476 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 6ec5912c13..5b88262d00 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 bb49fb64b9..426f4a4d23 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 dbadd3d020..26a26da149 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 91fe8a1c81..c20ab24395 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 a198bc190c..24a8639e78 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 ca25950d43..20f4f2cc5c 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 ae90d7017f..306f037c2f 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 53a38ff42b..02bca89ef9 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 399e161ee5..b8623876a3 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 5116e52d4e..4673825186 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 96e53725ce..6910b35070 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 9f1bc89930..cf088927b7 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 fbf459ebb7..5153db27cf 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 895982e523..d152f3fed6 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 4dd1134a2d..a713ee32db 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 32a8fd77c7..82953db73c 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 5ae83ce9d1..3256fd1647 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 66e7f77e0f..07608faf11 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 ef0628b442..02835c1635 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 a84f12fe25..ad7227f5f6 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 ed9de42301..88bf97b509 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 b1bc70912e..5a02a0bdff 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 01018fa83b..a09e3a7665 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 02648de246..14a10e9e9a 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 145c6b0099..aa93ae7d2d 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 1a72f77588..144661b3bf 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 2ac851b535..9e902a4b70 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 ce616f56a3..41a92a9f52 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 158745038c..ab8040bfd9 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 9064feddf3..14d1aec1a5 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 d1841da4bd..2ac7ad2b67 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 d07b3eccd9..a4e24bb646 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 de4d5b0f90..c339ae5847 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 7344daa6c1..9e51779e35 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 dd4e796afe..73c1933045 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 9431870711..01d7f00bdf 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 bf2cfcc0f2..e5e0bc4795 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 c5b41a2842..22321e4536 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 955392e768..e0d4109b71 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 694e0e4b78..fc5d82fa63 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 9b68cc0d19..34be349754 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 a14cc3b929..4e0fede0ec 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 2a193e7f5d..79f23b464b 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 e73b055210..2f2a8dc696 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 4e2abdb8b6..96d9e9ba73 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 0e4401a6d3..f48fe59eb6 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 29e1b54f39..4e3f8c4c80 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 61e72d60eb..be7492b3ee 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 b482a1c707..5d284c79b6 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 eb1fb90f6f..6c19b4af6e 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 1fdf02687c..1beb51d85f 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 66ea1acdc3..77ca8b5348 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 ab5ced7dde..dc42f287b5 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 efcd3e6bff..6a1628fba8 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 c37d1cb31d..727abc6798 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 d343569489..9c77967275 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 d09e9426df..dd6e3fada5 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 5981e9be1b..b22f083ae2 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 dd5097adac..dae83f9059 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 1c8bf59fb8..69f61ec1f9 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 6d52f4d9d7..ca5d9b572e 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 f05a0b8570..da34f099ea 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 5d95a9bf9f..916d322335 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 05be110fc1..d45c7fedb3 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 fae958a646..23a8cd11c4 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 28e9ea6b5f..98f85bb888 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 e22da92cf4..71ff1b50c2 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 186958d3d3..c0c2027928 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 ecc90daf6a..e74f212d54 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 4aa06402fe..1f09427d9e 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 0c5c5be3d9..2cd5948fc6 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 3e7ba90c54..92c2e442d6 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 f3911e494f..f6fa8517da 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 d944d1f231..658057dedb 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 b3cd7dfdcd..e3cb4603ae 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 7e1bf8c7af..1a26b4e188 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 eef686a9a4..1aabc45854 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 8e4314875f..8b763c160d 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 87a04a289c..06d67d164d 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 29ea41aeb4..27fa94c2ca 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 321a4c7675..7ce7858e64 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 8b7b3c51b5..2a999beed8 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 d636b4f246..1a07ad147b 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 d1045e90b1..52f61f2cf0 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 d8ea7a009a..675ce00a00 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 *