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

Hotant-Bu · Oct 26, 2011 · 0cb70e3 · 0cb70e3
2 parents a2c48e3 + 1aee718
commit 0cb70e3
Show file tree

Hide file tree

Showing 105 changed files with 110 additions and 107 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-2010 Niels Provos and Nick Mathewson
+Copyright (c) 2007-2011 Niels Provos and 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.c b/buffer.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2008-2011 Niels Provos and 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-2010 Niels Provos, Nick Mathewson
+ * Copyright (c) 2007-2011 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2011 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2011 Niels Provos and 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-2010 Niels Provos, Nick Mathewson
+ * Copyright (c) 2009-2011 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2011 Niels Provos and Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions

diff --git a/defer-internal.h b/defer-internal.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright 2009-2011 Niels Provos and 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-2010 Niels Provos, Nick Mathewson
+ * Copyright 2007-2011 Niels Provos, Nick Mathewson
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -121,15 +121,18 @@ epoll_init(struct event_base *base)
 
 	evutil_make_socket_closeonexec(epfd);
 
-	if (!(epollop = mm_calloc(1, sizeof(struct epollop))))
+	if (!(epollop = mm_calloc(1, sizeof(struct epollop)))) {
+		close(epfd);
 		return (NULL);
+	}
 
 	epollop->epfd = epfd;
 
 	/* Initialize fields */
 	epollop->events = mm_calloc(INITIAL_NEVENT, sizeof(struct epoll_event));
 	if (epollop->events == NULL) {
 		mm_free(epollop);
+		close(epfd);
 		return (NULL);
 	}
 	epollop->nevents = INITIAL_NEVENT;

diff --git a/epoll_sub.c b/epoll_sub.c
@@ -1,6 +1,6 @@
 /*
  * Copyright 2003-2009 Niels Provos <[email protected]>
- * Copyright 2009-2010 Niels Provos and Nick Mathewson
+ * Copyright 2009-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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.h b/evdns.h
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos, Nick Mathewson
+ * Copyright (c) 2009-2011 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_tagging.c b/event_tagging.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2003-2009 Niels Provos <[email protected]>
- * Copyright (c) 2009-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2009-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2006-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright 2007-2011 Niels Provos and 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-2010 Niels Provos, Nick Mathewson
+ * Copyright (c) 2008-2011 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-2010 Niels Provos, Nick Mathewson
+ * Copyright (c) 2008-2011 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-2010 Niels Provos and Nick Mathewson
+ * Copyright 2009-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright 2009-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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
@@ -1,6 +1,6 @@
 /* Based on work Copyright 2002 Christopher Clark */
-/* Copyright 2005-2010 Nick Mathewson */
-/* Copyright 2009-2010 Niels Provos and Nick Mathewson */
+/* Copyright 2005-2011 Nick Mathewson */
+/* Copyright 2009-2011 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
@@ -1,6 +1,6 @@
 /*
  * Copyright 2001-2007 Niels Provos <[email protected]>
- * Copyright 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright 2007-2011 Niels Provos and Nick Mathewson
  *
  * This header file contains definitions for dealing with HTTP requests
  * that are internal to libevent.  As user of the library, you should not

diff --git a/http.c b/http.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2002-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
- * Copyright (c) 2007-2010 Niels Provos and Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos and 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
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2010 Niels Provos, Nick Mathewson
+ * Copyright (c) 2007-2011 Niels Provos, Nick Mathewson
  * Copyright (c) 2000-2007 Niels Provos <[email protected]>
  * All rights reserved.
  *

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