diff options
| author | Nick Mathewson <nickm@torproject.org> | 2012-02-10 17:33:50 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2012-02-10 17:33:50 -0500 |
| commit | 539466e568ab7b676eece340b43ef98cae38c97a (patch) | |
| tree | b10c11fb020560728f149b60707cb605f4db908b | |
| parent | e465623a9c5ebc4bc85b7011c25d557a24a677d0 (diff) | |
| parent | e49e2891292ee84e08c319bc5031fe607efc4245 (diff) | |
| download | libevent-539466e568ab7b676eece340b43ef98cae38c97a.tar.gz | |
Merge remote-tracking branch 'origin/patches-2.0'
Conflicts:
Makefile.am
WIN32-Code/event2/event-config.h
configure.in
120 files changed, 296 insertions, 129 deletions
@@ -3,7 +3,7 @@ as the 3-clause (or "modified") BSD license: ============================== Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> -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 8f0907f4..47ebf199 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 93b590a9..f2ea1fcb 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 fc2c97bc..31f3842f 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu> - * 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 1d981015..7d5f230d 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 c1580139..e442e168 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 8cd32dcc..98799704 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu> - * 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 b8f73496..b28e4b62 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 7b54147f..bc70f8eb 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 <provos@citi.umich.edu> * All rights reserved. * diff --git a/bufferevent_openssl.c b/bufferevent_openssl.c index e89a74d4..090927da 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 271e305d..6d370733 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 44d18129..40586473 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 <provos@citi.umich.edu> * All rights reserved. * diff --git a/bufferevent_sock.c b/bufferevent_sock.c index 6bf8d197..bf9e35e0 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 <provos@citi.umich.edu> * 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 b60669ba..0e2770fe 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,10 @@ -dnl configure.in for libevent -dnl Dug Song <dugsong@monkey.org> +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 <dugsong@monkey.org> + AC_PREREQ(2.59) AC_INIT(event.c) diff --git a/defer-internal.h b/defer-internal.h index a413327b..d8443925 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 @@ -1,6 +1,6 @@ /* * Copyright 2000-2009 Niels Provos <provos@citi.umich.edu> - * 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 @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 f6471406..af35daa7 100644 --- a/epoll_sub.c +++ b/epoll_sub.c @@ -1,6 +1,6 @@ /* * Copyright 2003-2009 Niels Provos <provos@citi.umich.edu> - * 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 51806497..bdbde89e 100644 --- a/evbuffer-internal.h +++ b/evbuffer-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -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 <agl@imperialviolet.org> * http://www.imperialviolet.org/eventdns.html * Public Domain code @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 754ef759..1b6421db 100644 --- a/event-internal.h +++ b/event-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 d9610b67..0849c8ec 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 <provos@citi.umich.edu> +# Copyright (c) 2005-2007 Niels Provos <provos@citi.umich.edu> +# 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 d646ae3d..6bd922bb 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2009 Niels Provos <provos@citi.umich.edu> - * 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 @@ -1,6 +1,6 @@ /* * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 64269545..fd842676 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 @@ -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 @@ -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 <provos@citi.umich.edu> - * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 dbadd3d0..26a26da1 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 @@ -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 a198bc19..24a8639e 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 ca25950d..20f4f2cc 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 @@ -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 @@ -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 399e161e..b8623876 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 96e53725..6910b350 100644 --- a/http-internal.h +++ b/http-internal.h @@ -1,6 +1,6 @@ /* * Copyright 2001-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -1,6 +1,6 @@ /* * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu> - * 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 895982e5..d152f3fe 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 32a8fd77..82953db7 100644 --- a/include/event2/bufferevent.h +++ b/include/event2/bufferevent.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> * All rights reserved. * diff --git a/include/event2/bufferevent_ssl.h b/include/event2/bufferevent_ssl.h index 66e7f77e..07608faf 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 <provos@citi.umich.edu> - * 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 a84f12fe..ad7227f5 100644 --- a/include/event2/dns.h +++ b/include/event2/dns.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu> - * 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 ed9de423..88bf97b5 100644 --- a/include/event2/dns_compat.h +++ b/include/event2/dns_compat.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 01018fa8..a09e3a76 100644 --- a/include/event2/event.h +++ b/include/event2/event.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 145c6b00..aa93ae7d 100644 --- a/include/event2/event_struct.h +++ b/include/event2/event_struct.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 1a72f775..144661b3 100644 --- a/include/event2/http.h +++ b/include/event2/http.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 9064fedd..14d1aec1 100644 --- a/include/event2/listener.h +++ b/include/event2/listener.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 d1841da4..2ac7ad2b 100644 --- a/include/event2/rpc.h +++ b/include/event2/rpc.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 <provos@citi.umich.edu> - * 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 94318707..01d7f00b 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 bf2cfcc0..e5e0bc47 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 c5b41a28..22321e45 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 955392e7..e0d4109b 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 @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -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 a14cc3b9..4e0fede0 100644 --- a/log-internal.h +++ b/log-internal.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -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 <dugsong@monkey.org> * diff --git a/minheap-internal.h b/minheap-internal.h index e73b0552..2f2a8dc6 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 <maxim.yegorushkin@gmail.com> * diff --git a/mm-internal.h b/mm-internal.h index 4e2abdb8..96d9e9ba 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 @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 61e72d60..be7492b3 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 @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 @@ -2,7 +2,7 @@ /* * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 66ea1acd..77ca8b53 100644 --- a/test/bench.c +++ b/test/bench.c @@ -1,6 +1,6 @@ /* * Copyright 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 ab5ced7d..dc42f287 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 efcd3e6b..6a1628fb 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 c37d1cb3..727abc67 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 d3435694..9c779672 100644 --- a/test/regress.c +++ b/test/regress.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 d09e9426..dd6e3fad 100644 --- a/test/regress.h +++ b/test/regress.h @@ -1,6 +1,6 @@ /* * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * 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 5981e9be..b22f083a 100644 --- a/test/regress_buffer.c +++ b/test/regress_buffer.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 dd5097ad..dae83f90 100644 --- a/test/regress_bufferevent.c +++ b/test/regress_bufferevent.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 1c8bf59f..69f61ec1 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 6d52f4d9..ca5d9b57 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 f05a0b85..da34f099 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 05be110f..d45c7fed 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 fae958a6..23a8cd11 100644 --- a/test/regress_main.c +++ b/test/regress_main.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 28e9ea6b..98f85bb8 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 e22da92c..71ff1b50 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -1,6 +1,6 @@ /* * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> - * 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 186958d3..c0c20279 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 ecc90daf..e74f212d 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 0c5c5be3..2cd5948f 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 3e7ba90c..92c2e442 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 f3911e49..f6fa8517 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 d944d1f2..658057de 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 b3cd7dfd..e3cb4603 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 <provos@citi.umich.edu> + * 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 7e1bf8c7..1a26b4e1 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 <provos@citi.umich.edu> + * 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 eef686a9..1aabc458 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 8e431487..8b763c16 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 <provos@citi.umich.edu> + * 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 87a04a28..06d67d16 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 <provos@citi.umich.edu> + * 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 29ea41ae..27fa94c2 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 d1045e90..52f61f2c 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 d8ea7a00..675ce00a 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 <provos@citi.umich.edu> * Copyright 2003 Michael A. Davis <mike@datanerds.net> * |