Merge remote-tracking branch 'origin/patches-2.0'

Conflicts: Makefile.am WIN32-Code/event2/event-config.h configure.in
Hotant-Bu · Feb 10, 2012 · 539466e · 539466e
2 parents e465623 + e49e289
commit 539466e
Show file tree

Hide file tree

Showing 120 changed files with 296 additions and 129 deletions.
diff --git a/LICENSE b/LICENSE
@@ -3,7 +3,7 @@ as the 3-clause (or "modified") BSD license:
 
 ==============================
 Copyright (c) 2000-2007 Niels Provos <[email protected]>
-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
@@ -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
@@ -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
@@ -1,6 +1,7 @@
 /* Portable arc4random.c based on arc4random.c from OpenBSD.
  * Portable version by Chris Davis, adapted for Libevent by Nick Mathewson
  * Copyright (c) 2010 Chris Davis, Niels Provos, and Nick Mathewson
+ * Copyright (c) 2010-2012 Niels Provos and Nick Mathewson
  *
  * Note that in Libevent, this file isn't compiled directly.  Instead,
  * it's included from evutil_rand.c

diff --git a/buffer.c b/buffer.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002-2007 Niels Provos <[email protected]>
- * 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
@@ -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
@@ -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
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002-2007 Niels Provos <[email protected]>
- * 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
@@ -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
@@ -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 <[email protected]>
  * All rights reserved.
  *

diff --git 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
@@ -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
@@ -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 <[email protected]>
  * All rights reserved.
  *

diff --git 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 <[email protected]>
  * All rights reserved.
  *

diff --git 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
@@ -1,5 +1,10 @@
-dnl configure.in for libevent
-dnl Dug Song <[email protected]>
+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 <[email protected]>
+
 AC_PREREQ(2.59)
 AC_INIT(event.c)
 

diff --git a/defer-internal.h b/defer-internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/devpoll.c b/devpoll.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2009 Niels Provos <[email protected]>
- * Copyright 2009-2011 Niels Provos and Nick Mathewson
+ * Copyright 2009-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/epoll.c b/epoll.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Niels Provos <[email protected]>
- * 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
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2009 Niels Provos <[email protected]>
- * 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
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evdns.c b/evdns.c
@@ -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 <[email protected]>
  * http://www.imperialviolet.org/eventdns.html
  * Public Domain code

diff --git a/evdns.h b/evdns.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * 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
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/event.c b/event.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/event.h b/event.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * 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
@@ -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
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2005 Niels Provos <[email protected]>
+# Copyright (c) 2005-2007 Niels Provos <[email protected]>
+# 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
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003-2009 Niels Provos <[email protected]>
- * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evhttp.h b/evhttp.h
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Niels Provos <[email protected]>
- * 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evmap.c b/evmap.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evport.c b/evport.c
@@ -1,6 +1,9 @@
 /*
  * Submitted by David Pacheco ([email protected])
  *
+ * 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
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evrpc.c b/evrpc.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evrpc.h b/evrpc.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * 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
@@ -1,6 +1,6 @@
 /*
  * Copyright 2000-2007 Niels Provos <[email protected]>
- * 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2011 Niels Provos, Nick Mathewson
+ * Copyright (c) 2008-2012 Niels Provos, Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evthread.c b/evthread.c
@@ -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
@@ -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
@@ -1,5 +1,5 @@
 /*
- * Copyright 2009-2011 Niels Provos and Nick Mathewson
+ * Copyright 2009-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evutil.c b/evutil.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2011 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2012 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/evutil.h b/evutil.h
@@ -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
@@ -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