diff options
| author | Nick Mathewson <nickm@torproject.org> | 2009-01-27 22:34:36 +0000 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2009-01-27 22:34:36 +0000 |
| commit | b85b710cf5e693294e0d68ce682ecb1c5e357383 (patch) | |
| tree | 7a5379b0365817924c12e71d4bb25855bc0671ab | |
| parent | 8889a7703999d3ce5902b5b8e239107579c75ca0 (diff) | |
| download | libevent-b85b710cf5e693294e0d68ce682ecb1c5e357383.tar.gz | |
Update copyright statements to reflect the facts that:
a) this is 2009
b) niels and nick have been comaintainers for a while
c) saying "all rights reserved" when you then go on to explicitly
disclaim some rights is sheer cargo-cultism.
svn:r1065
64 files changed, 216 insertions, 107 deletions
diff --git a/WIN32-Code/win32.c b/WIN32-Code/win32.c index bc9188f3..fb6135a0 100644 --- a/WIN32-Code/win32.c +++ b/WIN32-Code/win32.c @@ -1,7 +1,7 @@ /* - * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 Niels Provos and Nick Mathewson + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> * Copyright 2003 Michael A. Davis <mike@datanerds.net> - * All rights reserved. * * 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) 2002, 2003 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 9f9c3af1..1fdb2be7 100644 --- a/bufferevent-internal.h +++ b/bufferevent-internal.h @@ -1,6 +1,5 @@ /* - * Copyright (c) 2008 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2008-2009 Niels Provos and 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 abdca342..8bf1d750 100644 --- a/bufferevent.c +++ b/bufferevent.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2002-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos, Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -1,6 +1,5 @@ /* - * Copyright 2000-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2009 Niels Provos <provos@citi.umich.edu> * * 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-2003 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 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 431970c7..55289d1f 100644 --- a/epoll_sub.c +++ b/epoll_sub.c @@ -1,6 +1,5 @@ /* - * Copyright 2003 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2003-2009 Niels Provos <provos@citi.umich.edu> * * 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 4b809b1a..09967748 100644 --- a/evbuffer-internal.h +++ b/evbuffer-internal.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 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) 2008 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 3dc8267e..e0fe9122 100644 --- a/event-internal.h +++ b/event-internal.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 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-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/event_tagging.c b/event_tagging.c index 5d0efaf6..001f44c1 100644 --- a/event_tagging.c +++ b/event_tagging.c @@ -1,6 +1,5 @@ /* - * Copyright (c) 2003, 2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2003-2009 Niels Provos <provos@citi.umich.edu> * * 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-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 Niels Provos and 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 3afeb72f..8134aa56 100644 --- a/evmap-internal.h +++ b/evmap-internal.h @@ -1,6 +1,5 @@ /* - * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2007-2009 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,5 @@ /* - * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/evrpc-internal.h b/evrpc-internal.h index 0db852da..79065ccb 100644 --- a/evrpc-internal.h +++ b/evrpc-internal.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 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-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 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) 2006 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 944558c5..fcae1a74 100644 --- a/evsignal-internal.h +++ b/evsignal-internal.h @@ -1,6 +1,6 @@ /* - * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 Niels Provos and 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 64f9928d..00268651 100644 --- a/evthread-internal.h +++ b/evthread-internal.h @@ -1,6 +1,5 @@ /* * Copyright (c) 2008 Niels Provos <provos@citi.umich.edu> - * All rights reserved. * * 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 1fe2c67b..1fa94ba9 100644 --- a/evthread_pthread.c +++ b/evthread_pthread.c @@ -1,3 +1,28 @@ +/* + * Copyright 2009 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. + */ #ifdef HAVE_CONFIG_H #include "event-config.h" #endif diff --git a/evthread_win32.c b/evthread_win32.c index 0c873f6f..7b64df50 100644 --- a/evthread_win32.c +++ b/evthread_win32.c @@ -1,3 +1,28 @@ +/* + * Copyright 2009 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. + */ #ifdef HAVE_CONFIG_H #include "event-config.h" #endif @@ -1,6 +1,5 @@ /* - * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2007-2009 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,5 @@ /* - * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 a64e150b..a7cd18c8 100644 --- a/ht-internal.h +++ b/ht-internal.h @@ -1,5 +1,6 @@ -/* Copyright 2002 Christopher Clark */ -/* Copyright 2005-9 Nick Mathewson */ +/* Possibly Copyright 2002 Christopher Clark */ +/* Copyright 2005-2009 Nick Mathewson */ +/* Copyright 2009 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 2f9ae236..ae474c0a 100644 --- a/http-internal.h +++ b/http-internal.h @@ -1,6 +1,6 @@ /* - * Copyright 2001 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2001-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 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-2006 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2002-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/include/event2/buffer.h b/include/event2/buffer.h index 658fea33..6aef2283 100644 --- a/include/event2/buffer.h +++ b/include/event2/buffer.h @@ -1,6 +1,5 @@ /* - * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 d0b54191..f3039a64 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 c41d7f3f..80a7cbe7 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 3c4e0b05..80cb4772 100644 --- a/include/event2/dns.h +++ b/include/event2/dns.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2006 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 4bf4cdba..26932a21 100644 --- a/include/event2/dns_compat.h +++ b/include/event2/dns_compat.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2006-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 76d8d9d8..90fc1fef 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 bc4ab004..4fd1f3cb 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 ad81eb21..31ada6a6 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 9fcc301d..d0a4c234 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 eab581a8..402a787a 100644 --- a/include/event2/http.h +++ b/include/event2/http.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 ec1088eb..8f2b8082 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 6e16c7dc..b1ac069e 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 3f166e79..0f967e02 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> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 ebb015f8..5c692d81 100644 --- a/include/event2/thread.h +++ b/include/event2/thread.h @@ -1,6 +1,5 @@ /* - * Copyright (c) 2008 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2008-2009 Niels Provos and 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 8c18f833..f22b9339 100644 --- a/include/event2/util.h +++ b/include/event2/util.h @@ -1,6 +1,5 @@ /* - * Copyright (c) 2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 bb3704d6..60e76e36 100644 --- a/ipv6-internal.h +++ b/ipv6-internal.h @@ -1,3 +1,29 @@ +/* + * Copyright (c) 2009 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. + */ + /* Internal use only: Fake IPv6 structures and values on platforms that * do not have them */ @@ -1,8 +1,8 @@ /* $OpenBSD: kqueue.c,v 1.5 2002/07/10 14:41:31 art Exp $ */ /* - * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 Niels Provos and 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 b537494e..6468f08b 100644 --- a/log-internal.h +++ b/log-internal.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 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 Nick Mathewson <nickm@freehaven.net> + * Copyright (c) 2005-2009 Niels Provos and Nick Mathewson * * Copyright (c) 2000 Dug Song <dugsong@monkey.org> * diff --git a/minheap-internal.h b/minheap-internal.h index 07b65e10..6cd9c4aa 100644 --- a/minheap-internal.h +++ b/minheap-internal.h @@ -1,6 +1,7 @@ /* + * Copyright (c) 2007-2009 Niels Provos and Nick Mathewson + * * Copyright (c) 2006 Maxim Yegorushkin <maxim.yegorushkin@gmail.com> - * All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/mm-internal.h b/mm-internal.h index 070ff6f0..6900e8f9 100644 --- a/mm-internal.h +++ b/mm-internal.h @@ -1,4 +1,28 @@ - +/* + * Copyright (c) 2007-2009 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. + */ #ifndef _EVENT_MM_INTERNAL_H #define _EVENT_MM_INTERNAL_H @@ -1,8 +1,8 @@ /* $OpenBSD: poll.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ /* - * Copyright 2000-2003 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 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,8 +1,8 @@ /* $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ /* - * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 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,8 +1,8 @@ /* $OpenBSD: select.c,v 1.2 2002/06/25 15:50:15 mickey Exp $ */ /* - * Copyright 2000-2002 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 Niels Provos and Nick Mathewson * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions diff --git a/test/bench.c b/test/bench.c index 6f1789f4..c065bb97 100644 --- a/test/bench.c +++ b/test/bench.c @@ -1,6 +1,6 @@ /* - * Copyright 2003 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2003-2007 Niels Provos <provos@citi.umich.edu> + * Copyright 2007-2009 Niels Provos and 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 1a243a05..fe80b990 100644 --- a/test/bench_cascade.c +++ b/test/bench_cascade.c @@ -1,6 +1,5 @@ /* - * Copyright 2007 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2007-2009 Niels Provos and 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 c9577abe..90d28b6a 100644 --- a/test/bench_http.c +++ b/test/bench_http.c @@ -1,6 +1,5 @@ /* - * Copyright 2008 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright 2008-2009 Niels Provos and 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 13782da6..8293f667 100644 --- a/test/regress.c +++ b/test/regress.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003, 2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 c84b1c43..b5b6f3e5 100644 --- a/test/regress.h +++ b/test/regress.h @@ -1,6 +1,6 @@ /* - * Copyright (c) 2000-2004 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2000-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 08acffc7..7ddc962e 100644 --- a/test/regress_dns.c +++ b/test/regress_dns.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 2ad5befc..478a0d2e 100644 --- a/test/regress_http.c +++ b/test/regress_http.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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_pthread.c b/test/regress_pthread.c index 72323ca8..1499583d 100644 --- a/test/regress_pthread.c +++ b/test/regress_pthread.c @@ -1,6 +1,5 @@ /* - * Copyright (c) 2008 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2007-2009 Niels Provos and 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 649d275d..879593c6 100644 --- a/test/regress_rpc.c +++ b/test/regress_rpc.c @@ -1,6 +1,6 @@ /* - * Copyright (c) 2003-2006 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2003-2007 Niels Provos <provos@citi.umich.edu> + * Copyright (c) 2007-2009 Niels Provos and 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 7bdec59d..ec465a84 100644 --- a/test/regress_util.c +++ b/test/regress_util.c @@ -1,6 +1,5 @@ /* - * Copyright (c) 2009 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2009 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 089b9928..0e7d3081 100644 --- a/test/regress_zlib.c +++ b/test/regress_zlib.c @@ -1,6 +1,5 @@ /* - * Copyright (c) 2008 Niels Provos <provos@citi.umich.edu> - * All rights reserved. + * Copyright (c) 2008-2009 Niels Provos and 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 536f0c35..30aa99ea 100644 --- a/util-internal.h +++ b/util-internal.h @@ -1,4 +1,28 @@ - +/* + * Copyright (c) 2007-2009 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. + */ #ifndef _EVENT_UTIL_INTERNAL_H #define _EVENT_UTIL_INTERNAL_H |