]> granicus.if.org Git - libevent/log
libevent
5 years agotest: make regress_dns C89 compatible
Leo Zhang [Tue, 15 May 2018 04:14:05 +0000 (12:14 +0800)]
test: make regress_dns C89 compatible

Closes: #635 (cherry-picked)
(cherry picked from commit d9ffd2213702bc22c467bd83c230a1a5e97e9e67)

5 years agoIgnore evconfig-private.h for autotools
Azat Khuzhin [Wed, 20 Jun 2018 23:37:24 +0000 (02:37 +0300)]
Ignore evconfig-private.h for autotools

Fixes: e2874d95af584b3657eb5dc1d2e5404811dce117 ("Adopt ignore rules for
cmake + ninja")

(cherry picked from commit 064a598716e69a1ac3937dd1bbc74194d0f3d3cf)

5 years agoReplace all EVENT_HAVE with EVENT__HAVE (EVENT__HAVE_USLEEP)
Azat Khuzhin [Tue, 19 Jun 2018 07:18:46 +0000 (10:18 +0300)]
Replace all EVENT_HAVE with EVENT__HAVE (EVENT__HAVE_USLEEP)

(cherry picked from commit 35258a1f4e09d9e7fcb003cd0572343670180495)

5 years agoAdd convenience macros for user-triggered events
Philip Prindeville [Sat, 16 Jun 2018 23:39:34 +0000 (17:39 -0600)]
Add convenience macros for user-triggered events

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Closes: #647 (picked)
(cherry picked from commit d2acf67ec3ad2916236396992f094c0c65016028)

5 years agoGet rid of macros which are never used
Philip Prindeville [Sat, 16 Jun 2018 22:44:06 +0000 (16:44 -0600)]
Get rid of macros which are never used

There are no expansions of these macros or tests for their existence.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
(cherry picked from commit 755896efe25e5caecd498c08cce072c713720783)

5 years agofix spelling mistakes
an-tao [Fri, 25 May 2018 10:07:28 +0000 (18:07 +0800)]
fix spelling mistakes

Closes: nmathewson/Libevent#162
(cherry picked from commit 0789bc5220af6eaa9b483afcd1405be6f01d2187)

5 years agoconfig.h can't be prefixed unconditionally
Philip Prindeville [Wed, 18 Apr 2018 21:09:35 +0000 (15:09 -0600)]
config.h can't be prefixed unconditionally

The script make-event-config.sed was mangling all the symbols by
prefixing them with "EVENT__".  The problem here is that some
symbols aren't for local consumption within libevent, but rather
influence other system header files (ex: __USE_FILE_OFFSET64 is
used by dozens of header files including <sys/sendfile.h>).

As a workaround, all symbols starting with a capital letter only
(with the exception of STDC_HEADERS which must also be left
untouched) will be mangled.

Future contributors will need to be aware of this distinction.

(cherry picked from commit 587e9f5828c4eb3c6e79e9eb29f174e4ae0c05bd)

5 years agoMake rpc headers self-compilable
Azat Khuzhin [Sun, 6 May 2018 23:39:44 +0000 (02:39 +0300)]
Make rpc headers self-compilable

Fixes: #633
(cherry picked from commit c57f5c34903b02c6e7378865f71a2b83a5befb96)

5 years agoNotify event base if there are no more events, so it can exit without delay
Azat Khuzhin [Mon, 23 Apr 2018 21:59:11 +0000 (00:59 +0300)]
Notify event base if there are no more events, so it can exit without delay

Fixes: #623
(cherry picked from commit 23c2914f6b430f2c2d74c267c13ffab3dda1b325)

5 years agoFix CheckFunctionExistsEx() cmake macro on win32
Azat Khuzhin [Sun, 22 Apr 2018 22:50:55 +0000 (01:50 +0300)]
Fix CheckFunctionExistsEx() cmake macro on win32

For example under mingw64 it could not detect that strtok_r() exists,
because it checks with:
  void *p = func_name;

And for this you need the function to be defined, so just sync our
CheckFunctionExistsEx.c with CheckFunctionExists.c from cmake (and later
we should drop them out) since it does correct things to detech
functions existence.

Also for WIN32 there is -FIwinsock2.h -FIws2tcpip.h, and I guess that is
not works for mingw gcc (since -F in gcc is framework, and in windows
-FI is like -include in gcc). But looks like we do not need them
already (due to fixed CheckFunctionExistsEx()).

Refs: #605
(cherry picked from commit accf383e044257ecdef002ea255056a5d15a4811)

5 years agotest/dns: install correct RLIMIT_NOFILE in bufferevent_connect_hostname_emfile
Azat Khuzhin [Tue, 24 Apr 2018 11:46:06 +0000 (14:46 +0300)]
test/dns: install correct RLIMIT_NOFILE in bufferevent_connect_hostname_emfile

Otherwise poll() will fail with EINVAL:
       EINVAL The nfds value exceeds the RLIMIT_NOFILE value.

P.S. and cleanup this test a little, with early-return.

CI: https://travis-ci.org/libevent/libevent/jobs/370350426
(cherry picked from commit d1c8993c3c34030b68ecb6079bd9dce8cb3d3604)

5 years agotravis-ci: allow tests under osx to fail (temporary, until we will fix them)
Azat Khuzhin [Mon, 23 Apr 2018 23:56:08 +0000 (02:56 +0300)]
travis-ci: allow tests under osx to fail (temporary, until we will fix them)

(cherry picked from commit da028dec497722793ada3ce1a0358c1bf68161de)

5 years agotest/http: cover evhttp_connection_get_addr() for incomming connections
Azat Khuzhin [Mon, 23 Apr 2018 23:22:58 +0000 (02:22 +0300)]
test/http: cover evhttp_connection_get_addr() for incomming connections

Refs: #510
(cherry picked from commit e4edc7fc27bb96b4811f1c24d591f5c5bca69bdd)

5 years agoFix evhttp_connection_get_addr() fox incomming http connections
Greg Hazel [Mon, 12 Feb 2018 00:28:58 +0000 (16:28 -0800)]
Fix evhttp_connection_get_addr() fox incomming http connections

Install conn_address of the bufferevent on incomping http connections
(even though this is kind of subsytem violation, so let's fix it in a
simplest way and thinkg about long-term solution).

Fixes: #510
Closes: #595 (pick)
(cherry picked from commit 367cd9e5c2b8e3f9b8dbed40bfe8a0ed79285c36)

5 years agotest/dns: verify bufferevent_socket_connect() errorcb invoking if socket() fails
Azat Khuzhin [Mon, 23 Apr 2018 22:45:00 +0000 (01:45 +0300)]
test/dns: verify bufferevent_socket_connect() errorcb invoking if socket() fails

Refs: #600
(cherry picked from commit a3d8f2e09302536c6c0ffc3ccb1fc6f43b51dc4f)

5 years agobufferevent_socket_connect{,_hostname}() missing event callback and use ret code
Jesse Fang [Fri, 23 Feb 2018 11:15:12 +0000 (19:15 +0800)]
bufferevent_socket_connect{,_hostname}() missing event callback and use ret code

- When socket() failed in bufferevent_socket_connect() , the event
  callback should be called also in
  bufferevent_socket_connect_hostname().  eg. when use
  bufferevent_socket_connect_hostname() to resolve and connect an IP
  address but process have a smaller ulimit open files, socket() fails
  always but caller is not notified.

- Make bufferevent_socket_connect()'s behavior more consistent: function
  return error then no callback, function return ok then error passed by
  event callback.

Fixes: #597
Closes: #599
Closes: #600
(cherry picked from commit f7bc1337977553f5f966f13840a5f7feba2d0bd5)

5 years agotest/dns: cleanup test_bufferevent_connect_hostname()
Azat Khuzhin [Mon, 23 Apr 2018 22:34:06 +0000 (01:34 +0300)]
test/dns: cleanup test_bufferevent_connect_hostname()

(cherry picked from commit 623ef3ccdc0aafac7ae77a723cbad6d552ff9a01)

5 years agoMerge branch 'pull-628'
Azat Khuzhin [Sun, 22 Apr 2018 21:52:57 +0000 (00:52 +0300)]
Merge branch 'pull-628'

* pull-628:
  Give priority to the build directory headers
  Do not ship evconfig-private.h in dist archive

Closes: #628
(cherry picked from commit a5f19422fdc91cf1e645fc318a174f33f132b9ac)

5 years agoAdopt ignore rules for cmake + ninja
Azat Khuzhin [Sun, 22 Apr 2018 21:26:08 +0000 (00:26 +0300)]
Adopt ignore rules for cmake + ninja

In case we have build directory differs from source directory there will be
bunch of files we should ignore, so just remove leading "/" for some or rules.
And fix others.

(cherry picked from commit e2874d95af584b3657eb5dc1d2e5404811dce117)

5 years agoFix assert() condition in evbuffer_drain() for IOCP
SuckShit [Fri, 20 Apr 2018 07:48:32 +0000 (15:48 +0800)]
Fix assert() condition in evbuffer_drain() for IOCP

In the case of iocp, in the for loop above, there is a situation where:
  remaining == chain->off == 0

And this happens due to CHAIN_PINNED_R() case (that is used only in
buffer_iocp.c)

Closes: #630 (picked)
(cherry picked from commit ab3224c3e66cf92779f8bd91ffe90445e636fa50)

5 years agoAdd Gitter badge
The Gitter Badger [Sun, 15 Apr 2018 23:02:05 +0000 (23:02 +0000)]
Add Gitter badge

(cherry picked from commit ba78ba9e8ba4c964dd5d14a281d7421c95d37937)

5 years agocmake: ensure windows dll's are installed as well as lib files
Philip Herron [Thu, 5 Apr 2018 14:17:06 +0000 (15:17 +0100)]
cmake: ensure windows dll's are installed as well as lib files

Closes: #621
(cherry picked from commit 0fa43c99fbba6f3b1827ada98302f548206a358f)

5 years agoGenerating evdns_base_config_windows_nameservers docs on all platforms
dpayne [Tue, 3 Apr 2018 22:43:22 +0000 (15:43 -0700)]
Generating evdns_base_config_windows_nameservers docs on all platforms

(cherry picked from commit 791e3de0c38f9f413f33addcac2d8bca68590ca6)

5 years agoFixing doxygen docs for evdns_base_search_clear when generated on non-windows machines
dpayne [Tue, 3 Apr 2018 22:17:51 +0000 (15:17 -0700)]
Fixing doxygen docs for evdns_base_search_clear when generated on non-windows machines

(cherry picked from commit 2c1562949c49febe9a4d5ec33cabe99f1f6a82e1)

5 years agoFix build with LibreSSL 2.7
Bernard Spil [Mon, 2 Apr 2018 11:18:27 +0000 (13:18 +0200)]
Fix build with LibreSSL 2.7

LibreSSL 2.7 implements OpenSSL 1.1 API except for BIO_get_init()

See also: https://bugs.freebsd.org/226900
Signed-off-by: Bernard Spil <brnrd@FreeBSD.org>
Closes: #617 (cherry-pick)
(cherry picked from commit 28b8075400c70b2d2da2ce07e590c2ec6d11783d)

5 years agoAvoid possible SEGVs in select() (in unit tests)
Philip Prindeville [Wed, 28 Mar 2018 14:25:28 +0000 (08:25 -0600)]
Avoid possible SEGVs in select() (in unit tests)

Per the POSIX definition of select():

http://pubs.opengroup.org/onlinepubs/009696699/functions/pselect.html

"Upon successful completion, the select() function may modify the object
pointed to by the timout argument."

If "struct timeval" pointer is a "static const", it could potentially
be allocated in a RO text segment.  The kernel would then try to copy
back the modified value (with the time remaining) into a read-only
address and SEGV.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Closes: #614
(cherry picked from commit 33baa4e59fbf9432d77a19c6b2b45402580b79a5)

5 years agodon't fail be_null_filter if bytes are copied
Greg Hazel [Wed, 21 Mar 2018 01:04:53 +0000 (18:04 -0700)]
don't fail be_null_filter if bytes are copied

Otherwise it will not reset timeouts for the IO, but other things should
still works correctly.

Also evbuffer_remove_buffer() could return 0, due to empty buffers, for
example during flushing bufferevent, so let's count this is BEV_OK too.

(cherry picked from commit 4ba48739673060baea581774992970fa46c2f813)

5 years agoCall underlying bev ctrl GET_FD on filtered bufferevents
Greg Hazel [Tue, 20 Mar 2018 22:12:07 +0000 (15:12 -0700)]
Call underlying bev ctrl GET_FD on filtered bufferevents

Fixes: #611
Fixes: #610
(cherry picked from commit 4055081499cba32642dd72427a8f9d3ad7e50e79)

5 years agoFix base unlocking in event_del() if event_base_set() runned in another thread
Azat Khuzhin [Tue, 27 Feb 2018 18:12:14 +0000 (21:12 +0300)]
Fix base unlocking in event_del() if event_base_set() runned in another thread

Image next situation:
  T1:                                        T2:
   event_del_()
     lock the event.ev_base.th_base_lock
     event_del_nolock_()                     event_set_base()
     unlock the event.ev_base.th_base_lock

In this case we will unlock the wrong base after event_del_nolock_()
returns, and deadlock is likely to happens, since event_base_set() do
not check any mutexes (due to it is possible to do this only if event is
not inserted anywhere).

So event_del_() has to cache the base before removing the event, and
cached base.th_base_lock after.

(cherry picked from commit 08a0d366073eacf800027725891c2f668f2f0144)

5 years agoConvert event_debug_*() helpers from macros to static functions
Azat Khuzhin [Tue, 27 Feb 2018 18:08:35 +0000 (21:08 +0300)]
Convert event_debug_*() helpers from macros to static functions

(cherry picked from commit f0fd92f2c41fd5bf3b270ee338089dd9329d0354)

5 years agoProvide Makefile variables LIBEVENT_{CFLAGS,CPPFLAGS,LDFLAGS}
stenn [Sun, 14 May 2017 10:22:11 +0000 (06:22 -0400)]
Provide Makefile variables LIBEVENT_{CFLAGS,CPPFLAGS,LDFLAGS}

This will allow a parent package to specify compiler, CPP, and linker
flags to a libevent built as a sub-package.

Picked-from: #506
Closes: #506
(cherry picked from commit 1a448088e3aef5b6baf161eb0f6d17e18a77313c)

5 years agohttp: remove message in case !Content-Length and Connection!=close
Azat Khuzhin [Tue, 13 Feb 2018 14:43:02 +0000 (17:43 +0300)]
http: remove message in case !Content-Length and Connection!=close

Since [1] GET can have body, and hence for every incomming connection it
will print this error.

[1] db483e3b002b33890fc88cadd77f6fd1fccad2d2 ("Allow bodies for
GET/DELETE/OPTIONS/CONNECT")

Noticed-by: BotoX (irc)
Refs: #408
(cherry picked from commit cd57e38c3f77d0f6a718d9c1f2e3ead78a98bd06)

5 years agobuffer: fix incorrect unlock of the buffer mutex (for deferred callbacks)
Azat Khuzhin [Mon, 12 Feb 2018 16:43:13 +0000 (19:43 +0300)]
buffer: fix incorrect unlock of the buffer mutex (for deferred callbacks)

TSAN reports:
  WARNING: ThreadSanitizer: unlock of an unlocked mutex (or by a wrong thread) (pid=17111)
      #0 pthread_mutex_unlock /build/gcc/src/gcc/libsanitizer/sanitizer_common/sanitizer_common_interceptors.inc:3621 (libtsan.so.0+0x00000003b71c)
      #1 evbuffer_add <null> (libevent_core-2.2.so.1+0x00000000ddb6)
      ...

    Mutex M392 (0x7b0c00000f00) created at:
      #0 pthread_mutex_init /build/gcc/src/gcc/libsanitizer/tsan/tsan_interceptors.cc:1117 (libtsan.so.0+0x0000000291af)
      #1 <null> <null> (libevent_pthreads-2.2.so.1+0x000000000d46)
      ...

$ addr2line -e /lib/libevent_core-2.2.so.1 0x00000000ddb6
/src/libevent/buffer.c:1815 (discriminator 1)

Introduced-in: ae2b84b2575be93d0aebba5c0b78453836f89f3c ("Replace
deferred_cbs with event_callback-based implementation.")

(cherry picked from commit 93913da1c4a528e0a832dc8dc163fa30f3e580d4)

5 years agoFix typos in comments
Dmitry Alimov [Mon, 15 Jan 2018 14:30:08 +0000 (17:30 +0300)]
Fix typos in comments

(cherry picked from commit f24b28e4aff1dbc3440e283f70ac15aa7cebcc8d)

5 years agohttp: fix leaks in evhttp_uriencode()
Azat Khuzhin [Tue, 9 Jan 2018 18:44:57 +0000 (21:44 +0300)]
http: fix leaks in evhttp_uriencode()

Fixes: #584
(cherry picked from commit 61c21492680505706cad9240c39666ee3b56a89c)

5 years agoMerge branch 'listener-immediate-close'
Azat Khuzhin [Thu, 4 Jan 2018 16:28:59 +0000 (19:28 +0300)]
Merge branch 'listener-immediate-close'

* listener-immediate-close:
  test/listener: cover immediate-close logic
  Immediately stop trying to accept more connections if listener disabled

(cherry picked from commit 416b48ba7a0b44407b7a053bd21830aa75d7162f)

5 years agoFixed last_with_datap description
Marcin Szewczyk [Mon, 18 Dec 2017 13:01:15 +0000 (14:01 +0100)]
Fixed last_with_datap description

Grammar and typo fix

(cherry picked from commit 88a1abe809e5d29618b722ff81ee2fb14119314f)

5 years agoFix typo in cmake because of which EVENT__SIZEOF_SIZE_T was wrong
Azat Khuzhin [Sat, 16 Dec 2017 20:28:41 +0000 (23:28 +0300)]
Fix typo in cmake because of which EVENT__SIZEOF_SIZE_T was wrong

Fixes: #580
(cherry picked from commit 6e5c15d095d37036553d491b52d27fbbda08e7f2)

5 years agoCONNECT method only takes an authority
Greg Hazel [Sat, 2 Dec 2017 20:53:57 +0000 (12:53 -0800)]
CONNECT method only takes an authority

(cherry picked from commit 65eb529a9f4dd886d01a9d77ce6d971de9fb1b97)

5 years agoIf precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER
yongqing.jiao [Sat, 9 Dec 2017 06:39:07 +0000 (14:39 +0800)]
If precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER

Fixes: 630f077c296de61c7b99ed83bf30de11e75e2740 ("Simple unit tests for
monotonic timers")

(cherry picked from commit 6cce7458d0f94e320f201eb5be94866e6918d66c)

5 years agoMerge branch 'evconnlistener-do-not-close-client-fd'
Azat Khuzhin [Sun, 10 Dec 2017 20:57:19 +0000 (23:57 +0300)]
Merge branch 'evconnlistener-do-not-close-client-fd'

Fixes: #577
* evconnlistener-do-not-close-client-fd:
  listener: cover closing of fd in case evconnlistener_free() called from acceptcb
  Revert "Fix potential fd leak in listener_read_cb()"

(cherry picked from commit bc65ffc14c62c10feffefe6c3d9975ce1d1a8cd8)

5 years agoFix generation of LibeventConfig.cmake for the installation tree
Andrey Okoshkin [Wed, 29 Nov 2017 08:13:51 +0000 (11:13 +0300)]
Fix generation of LibeventConfig.cmake for the installation tree

'LIBEVENT_INCLUDE_DIRS' is properly initialized in 'LibeventConfig.cmake' as
'LibeventConfig.cmake.in' contains usage of 'LIBEVENT_CMAKE_DIR' and
'EVENT_INSTALL_INCLUDE_DIR' variables but not 'EVENT_CMAKE_DIR' and
'EVENT__INCLUDE_DIRS'.
Related typos are fixed.

(cherry picked from commit 6ee73ea9b0b15a9f4909c51e171b7799210ec26c)

5 years agoAdd missing includes into openssl-compat.h
Azat Khuzhin [Wed, 22 Nov 2017 07:33:15 +0000 (10:33 +0300)]
Add missing includes into openssl-compat.h

Before it depends from the caller #include appropriate headers (at least
for OPENSSL_VERSION_NUMBER), but let's make it independent.

Fixes: #574
(cherry picked from commit c2c08e0203da93938fe35234fa3a1be4d1c3c2e1)

5 years agoFree dns/event bases in dns-example to avoid leaks
Azat Khuzhin [Sun, 19 Nov 2017 23:07:54 +0000 (02:07 +0300)]
Free dns/event bases in dns-example to avoid leaks

(cherry picked from commit 33e363f3dfcd21f5125134395e4a7b3531bc3066)

5 years agoFix incorrect ref to evhttp_get_decoded_uri in http.h
ejurgensen [Sun, 5 Nov 2017 11:18:49 +0000 (12:18 +0100)]
Fix incorrect ref to evhttp_get_decoded_uri in http.h

Replaces reference in the http.h include header file to evhttp_get_decoded_uri
with evhttp_uridecode. There is no function called evhttp_get_decoded_uri.

(cherry picked from commit b49c70cc2ed54f511e2b41f7ed61d357c88300be)

5 years agoFix crashing http server when callback do not reply in place from *gencb*
Azat Khuzhin [Sat, 4 Nov 2017 16:13:28 +0000 (19:13 +0300)]
Fix crashing http server when callback do not reply in place from *gencb*

This is the second hunk of the first patch
5ff8eb26371c4dc56f384b2de35bea2d87814779 ("Fix crashing http server when
callback do not reply in place")

Fixes: #567
(cherry picked from commit 306747e51c1f0de679a3b165b9429418c89f8d6a)

5 years agocmake doesn't has POLICY CMP0054 in low version
lightningkay [Thu, 2 Nov 2017 06:58:17 +0000 (14:58 +0800)]
cmake doesn't has POLICY CMP0054 in low version

(cherry picked from commit 3f19c5eb8335500ca6f0dd3b62c32d06103757d0)

5 years agoAllow bodies for GET/DELETE/OPTIONS/CONNECT
Azat Khuzhin [Sun, 29 Oct 2017 19:53:41 +0000 (22:53 +0300)]
Allow bodies for GET/DELETE/OPTIONS/CONNECT

I checked with nginx, and via it's lua bindings it allows body for all
this methods. Also everybody knows that some of web-servers allows body
for GET even though this is not RFC conformant.

Refs: #408
(cherry picked from commit db483e3b002b33890fc88cadd77f6fd1fccad2d2)

5 years agoDo not crash when evhttp_send_reply_start() is called after a timeout.
Andreas Gustafsson [Tue, 26 Sep 2017 16:23:29 +0000 (19:23 +0300)]
Do not crash when evhttp_send_reply_start() is called after a timeout.

This fixes the crash reported in issue #509.  The "would be nice"
items discussed in #509 can be addressed separately.

(cherry picked from commit 99d0a952dada771b91acf63f5208b994e80a2986)

5 years agoFix crashing http server when callback do not reply in place
Azat Khuzhin [Sun, 22 Oct 2017 21:13:37 +0000 (00:13 +0300)]
Fix crashing http server when callback do not reply in place

General http callback looks like:
  static void http_cb(struct evhttp_request *req, void *arg)
  {
    evhttp_send_reply(req, HTTP_OK, "Everything is fine", NULL);
  }

And they will work fine becuase in this case http will write request
first, and during write preparation it will disable *read callback* (in
evhttp_write_buffer()), but if we don't reply immediately, for example:
  static void http_cb(struct evhttp_request *req, void *arg)
  {
    return;
  }

This will leave connection in incorrect state, and if another request
will be written to the same connection libevent will abort with:
  [err] ../http.c: illegal connection state 7

Because it thinks that read for now is not possible, since there were no
write.

Fix this by disabling EV_READ entirely. We couldn't just reset callbacks
because this will leave EOF detection, which we don't need, since user
hasn't replied to callback yet.

Reported-by: Cory Fields <cory@coryfields.com>
(cherry picked from commit 5ff8eb26371c4dc56f384b2de35bea2d87814779)

5 years agofix handling of close_notify (ssl) in http with openssl bufferevents
Azat Khuzhin [Wed, 13 Sep 2017 18:39:32 +0000 (21:39 +0300)]
fix handling of close_notify (ssl) in http with openssl bufferevents

Since it can arrive after we disabled events in that bufferevent and
reseted fd, hence evhttp_error_cb() could be called after
SSL_RECEIVED_SHUTDOWN.

Closes: #557
(cherry picked from commit da3f2ba22adcabaf7355a90d537b4928d0c168d2)

5 years agoPort `event_rpcgen.py` and `test/check-dumpevents.py` to Python 3.
Kiyoshi Aman [Thu, 14 Sep 2017 22:39:20 +0000 (17:39 -0500)]
Port `event_rpcgen.py` and `test/check-dumpevents.py` to Python 3.

These scripts remain compatible with Python 2.

(cherry picked from commit 8b0aa7b36a3250fad4953f194c8a94ab25032583)

5 years agoRemove OpenSSL paragram from README
Azat Khuzhin [Sun, 24 Sep 2017 12:12:13 +0000 (15:12 +0300)]
Remove OpenSSL paragram from README

Because it is mauvais ton to use binaries instead of normal packages
(like apt-get in debian, pacman in arch, and others).

Plus that link was borken and according to [1] OpenSSL do not ship
binaries officially.

And personally I don't think that this is not obvious that you need
openssl libraries to build libevent with it's support, and BTW you need
headers too (of course).

[1]: https://www.openssl.org/community/binaries.html
Fixes: #562
(cherry picked from commit 62866f98a5979e3b9ee8db0287be79749fcf7d6a)

5 years agotest: fix warning
Vincent JARDIN [Mon, 11 Sep 2017 19:56:30 +0000 (21:56 +0200)]
test: fix warning

In function ‘send_a_byte_cb’:
test/regress.c:1853:2: warning: ignoring return value of ‘write’, declared with
attribute warn_unused_result [-Wunused-result]
  (void) write(*sockp, "A", 1);

(cherry picked from commit 56010f37ae5b49881f7fd255d5c8a936e1c36909)

5 years agoconfigure: avoid false positive in DragonFlyBSD
Carlo Marcelo Arenas Belón [Sat, 19 Aug 2017 23:01:46 +0000 (16:01 -0700)]
configure: avoid false positive in DragonFlyBSD

by default, the max buffer size is 16K and histeresis is at 50%, so
a bigger read is needed to unlock writes than you would expect from
other BSD (512 bytes)

this doesn't introduce any regression on FreeBSD 11.1, OpenBSD 6.1, NetBSD 7.1,
macOS 10.12.6 and of course DragonFlyBSD 4.8.1, and most of them show
a max pipe size of 64K, so the read call should drain them all regardless
of how conservative they are on the free pipe space they will require
(usually 512 bytes) before kevent reports the fd as ready for write.

I couldn't find a reference to which bug this code was trying to look for
and it seems to be there from the beginning of git history so it might be
no longer relevant.

Issue: #548
(cherry picked from commit 1dfec8a97094a26317eac9b3d8a1c16eb1a7dbea)

5 years agotest: avoid regress hanging in macOS
Carlo Marcelo Arenas Belón [Wed, 16 Aug 2017 23:52:33 +0000 (16:52 -0700)]
test: avoid regress hanging in macOS

a backtrace of the process without this patch :
  * thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGSTOP
    * frame #0: 0x00007fffb1fb7d96 libsystem_kernel.dylib`kevent + 10
      frame #1: 0x0000000108ed0a58 libevent-2.2.1.dylib`kq_dispatch + 696
      frame #2: 0x0000000108ec53d8 libevent-2.2.1.dylib`event_base_loop + 696
      frame #3: 0x0000000108e1763b regress`test_fork + 1931
      frame #4: 0x0000000108e5c7ad regress`run_legacy_test_fn + 45
      frame #5: 0x0000000108e690aa regress`testcase_run_one + 858
      frame #6: 0x0000000108e6954f regress`tinytest_main + 495
      frame #7: 0x0000000108e5c94b regress`main + 171
      frame #8: 0x00007fffb1e88235 libdyld.dylib`start + 1
      frame #9: 0x00007fffb1e88235 libdyld.dylib`start + 1

Issue: #546
(cherry picked from commit a86f89d333d870e6714bd28c695ba1774df3d7f5)

5 years agoautotools: confirm openssl is working before using
Carlo Marcelo Arenas Belón [Tue, 29 Aug 2017 07:44:57 +0000 (00:44 -0700)]
autotools: confirm openssl is working before using

latest versions of macOS provide pkg-config and libraries for an ancient
version of openssl as part of the system, but no headers

(cherry picked from commit 506df426dbeb0187bbd3654bd286b4100628fb16)

5 years agotest: fix 32bit linux regress
Carlo Marcelo Arenas Belón [Fri, 1 Sep 2017 22:50:36 +0000 (15:50 -0700)]
test: fix 32bit linux regress

(cherry picked from commit 63c4bf78d6af3c6ff46d2e8e4b53dd9f577a9ca9)

5 years agoautotools: pass $(OPENSSL_INCS) for samples (FTBFS macOS)
Carlo Marcelo Arenas Belón [Mon, 21 Aug 2017 08:08:15 +0000 (01:08 -0700)]
autotools: pass $(OPENSSL_INCS) for samples (FTBFS macOS)

if OpenSSL is in a non standard location, need to pass that information
to any sample that needs it

Closes: #550
(cherry picked from commit 0ec5edde503096a81831f36441a4115574ac45f0)

5 years agoalways define EV_INT16_MIN
Carlo Marcelo Arenas Belón [Thu, 17 Aug 2017 08:37:01 +0000 (01:37 -0700)]
always define EV_INT16_MIN

somehow missing from 043ae7481f4a73b0f48055a0260afa454f02d136

(cherry picked from commit 5698cff73dac815dab937fd0262dd1f910ad1c3c)

5 years agoAdd configure check for midipix
Redfoxmoon [Tue, 15 Aug 2017 03:11:05 +0000 (05:11 +0200)]
Add configure check for midipix

Fixes: #540
(cherry picked from commit 94e5cc84d5adf8075a1a98263d16756faec8ea30)

5 years agoFix race in access to ev_res from event loop with event_active()
James Synge [Mon, 7 Aug 2017 15:06:28 +0000 (11:06 -0400)]
Fix race in access to ev_res from event loop with event_active()

Detected using ThreadSanitizer, resolved by capturing the value
of ev_res in a local variable while the event is locked, then
passing that captured variable to the callback.

TSAN report:
  I0728 14:35:09.822118   WARNING: ThreadSanitizer: data race (pid=815501)
  I0728 14:35:09.822186     Write of size 2 at 0x7b2c00001bf2 by thread T80 (mutexes: write M1110835549570434736):
  I0728 14:35:09.822248       #0 event_active_nolock_ libevent/event.c:2893:14 (0a2b90577e830d775300664df77d0b91+0x1fdab28)
  I0728 14:35:09.822316       #1 event_active libevent/event.c:2858:2 (0a2b90577e830d775300664df77d0b91+0x1fdd10e)
  I0728 14:35:09.822379       #2 Envoy::Event::TimerImpl::enableTimer(std::chrono::duration<long, std::ratio<1l, 1000l> > const&) envoy/source/common/event/timer_impl.cc:24:5 (0a2b90577e830d775300664df77d0b91+0x459fa0)
  ...

  I0728 14:35:09.824146     Previous read of size 2 at 0x7b2c00001bf2 by main thread:
  I0728 14:35:09.824232       #0 event_process_active_single_queue libevent/event.c:1646:33 (0a2b90577e830d775300664df77d0b91+0x1fdf83d)
  I0728 14:35:09.824350       #1 event_process_active libevent/event.c (0a2b90577e830d775300664df77d0b91+0x1fd9ad8)
  I0728 14:35:09.824445       #2 event_base_loop libevent/event.c:1961 (0a2b90577e830d775300664df77d0b91+0x1fd9ad8)
  I0728 14:35:09.824550       #3 Envoy::Event::DispatcherImpl::run(Envoy::Event::Dispatcher::RunType) envoy/source/common/event/dispatcher_impl.cc:166:3 (0a2b90577e830d775300664df77d0b91+0x4576d9)
  ...

Fixes: #543 (pull-request)
(cherry picked from commit 27934f0b39991172dcfdad23faea9874dd386f10)

5 years agoRemove check against passed bufferevent in bufferevent_socket_connect()
Azat Khuzhin [Mon, 14 Aug 2017 20:11:53 +0000 (23:11 +0300)]
Remove check against passed bufferevent in bufferevent_socket_connect()

It is a bit confusing to check against the result of EVUTIL_UPCAST(),
because it can return not NULL for NULL pointers, but for even though
with bufferevent we are fine (because bufferevent is the first field in
bufferevent_private), there are no checks for "bufev" in bufferevent's
API, so just remove it to make it generic.

Fixes: #542
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com>
(cherry picked from commit a10a6f4ed918ea1432820d99e9373f37f906d6f0)

5 years agoFix wrong assert in evbuffer_drain()
Azat Khuzhin [Mon, 14 Aug 2017 20:03:48 +0000 (23:03 +0300)]
Fix wrong assert in evbuffer_drain()

"chain" cannot be NULL here because we have at least one chain (we
handle empty buffer separatelly) and hence loop will be executed at
least once.

Link: https://github.com/libevent/libevent/commit/841ecbd96105c84ac2e7c9594aeadbcc6fb38bc4#commitcomment-23631347
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com>
(cherry picked from commit b26996a05d9e7aad32e78a7bfab6454d5c11500a)

5 years agoMerge remote-tracking branch 'official/pr/527' -- documentation fixes
Azat Khuzhin [Sun, 16 Jul 2017 18:40:18 +0000 (21:40 +0300)]
Merge remote-tracking branch 'official/pr/527' -- documentation fixes

* official/pr/527:
  Fix a few trivial documentation typos
  Clarify event_free() documentation regarding pending/active events

(cherry picked from commit e83443ec67d45447296c2ce320620a07c88e1d32)

5 years agoFix tests with detached builds
Ondřej Kuzník [Wed, 28 Jun 2017 11:29:29 +0000 (12:29 +0100)]
Fix tests with detached builds

Closes: #524
(cherry picked from commit cf7f5b0dc484152ae3be7ea6ba57552595891608)

5 years agoDocument some obvious cases where a function might also return NULL
Nikolay Edigaryev [Thu, 29 Jun 2017 21:27:08 +0000 (02:27 +0500)]
Document some obvious cases where a function might also return NULL

Closes: #525
(cherry picked from commit 808524252f888303e4e95f09c3f8c225ef08f096)

5 years agoFix event_debug_logging_mask_ exporting on win32
Azat Khuzhin [Mon, 29 May 2017 19:11:48 +0000 (22:11 +0300)]
Fix event_debug_logging_mask_ exporting on win32

(cherry picked from commit cd285e425a906276efafab901d1b9da0e388be48)

5 years agoFix visibility issues under (mostly on win32)
Azat Khuzhin [Mon, 29 May 2017 12:04:50 +0000 (15:04 +0300)]
Fix visibility issues under (mostly on win32)

Refs: #511
Fixes: 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED and
STATIC libraries (like autoconf does)")

(cherry picked from commit ce3af533f1b11c4b302d404483f28660eb5d7190)

5 years agocmake: set CMP0054 to NEW to avoid variables over expansion (since cmake 3.8)
Azat Khuzhin [Mon, 29 May 2017 15:48:48 +0000 (18:48 +0300)]
cmake: set CMP0054 to NEW to avoid variables over expansion (since cmake 3.8)

==> win: CMake Warning (dev) at CMakeLists.txt:782 (elseif):
==> win:   Policy CMP0054 is not set: Only interpret if() arguments as variables or
==> win:   keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
==> win:   details.  Use the cmake_policy command to set the policy and suppress this
==> win:   warning.
==> win:
==> win:   Quoted variables like "MSVC" will no longer be dereferenced when the policy
==> win:   is set to NEW.  Since the policy is not set the OLD behavior will be used.
==> win: This warning is for project developers.  Use -Wno-dev to suppress it.

(cherry picked from commit 2773a5ed5e75540d43500e054581ea1fab2132ac)

5 years agocmake: fix building bench/bench_cascade under win32 (missing getopt)
Azat Khuzhin [Mon, 29 May 2017 13:36:24 +0000 (16:36 +0300)]
cmake: fix building bench/bench_cascade under win32 (missing getopt)

Because of typo in cmake, now rewrote to make it less error prone (since even
for non-win32 there are variables overlap).

(cherry picked from commit 8b29b136793f3bfdb22fba117527763434363a3f)

5 years agocmake: avoid requiring cmake 3.1 on win32 for dns-example
Azat Khuzhin [Mon, 29 May 2017 13:32:30 +0000 (16:32 +0300)]
cmake: avoid requiring cmake 3.1 on win32 for dns-example

Avoid using target_sources() from cmake 3.1, just pass needable sources as
list.

(cherry picked from commit 346f8e17080f4649986e0d48176c0a0a5618ea98)

5 years agole-proxy: fix compiling under win32 (because of no "inline" in C)
Azat Khuzhin [Mon, 29 May 2017 13:24:48 +0000 (16:24 +0300)]
le-proxy: fix compiling under win32 (because of no "inline" in C)

Include <util-internal.h> for regular "inline", since it is used everywhere.

(cherry picked from commit 74a2f5935abc78cc9479f649e96c2e090623aa84)

5 years agohttp-connect: exit on error
Azat Khuzhin [Sun, 28 May 2017 13:38:20 +0000 (16:38 +0300)]
http-connect: exit on error

(cherry picked from commit d22e12eefa11aab34b95e8b07b823f3ad0597239)

5 years agotest: do not use .fieldname in structure initializations (fixes win32)
Azat Khuzhin [Mon, 1 May 2017 18:56:27 +0000 (21:56 +0300)]
test: do not use .fieldname in structure initializations (fixes win32)

Fixes: #497
(cherry picked from commit 15da23cfdbeb5d5b4eeafca0cd93962c26641ae5)

5 years agoAdd missing print-winsock-errors.c into dist archive
Azat Khuzhin [Mon, 1 May 2017 18:55:00 +0000 (21:55 +0300)]
Add missing print-winsock-errors.c into dist archive

Refs: #497
(cherry picked from commit 8d89c212587c560df8cd7089fb1a2fcd2a3dca82)

5 years agole-proxy: add missing return statement (UAF)
Maximilian Brunner [Tue, 25 Apr 2017 21:10:13 +0000 (23:10 +0200)]
le-proxy: add missing return statement (UAF)

Refs: #501501501501501501501501501
(cherry picked from commit 00ae45fe53e9e01f61f97c90deba1deb6ac1bc9f)

5 years agoReturn from event_del() after the last event callback termination
José Luis Millán [Mon, 13 Apr 2015 06:54:52 +0000 (08:54 +0200)]
Return from event_del() after the last event callback termination

Delete the event from the queue before blocking for the current
event callback termination.

Ensures that no callback is being executed when event_del() returns,
hence making this function a secure mechanism to access data which is
handled in the event callack.

Fixes: #236
Fixes: #225
Refs: 6b4b77a
Fixes: del_wait
(cherry picked from commit 0b4b0efdb8ee710ccae5bad320fc24843fd428e5)

5 years agotest: cover that after event_del() callback will not be scheduled again
Azat Khuzhin [Sat, 29 Apr 2017 22:11:31 +0000 (01:11 +0300)]
test: cover that after event_del() callback will not be scheduled again

Refs: #236
Refs: #225
(cherry picked from commit 5ff83989f30daef93a851c2162667375ed1663a5)

5 years agoCorrect URL for the libevent logo
Gonçalo Ribeiro [Fri, 28 Apr 2017 18:36:42 +0000 (19:36 +0100)]
Correct URL for the libevent logo

(cherry picked from commit f988c5ca0eb654a8e60df174abfc63dd9476be5e)

5 years agoExplicitly call SSL_clear when reseting the fd.
David Benjamin [Thu, 20 Apr 2017 22:03:50 +0000 (18:03 -0400)]
Explicitly call SSL_clear when reseting the fd.

If reconnecting the via BEV_CTRL_SET_FD, bufferevent_openssl.c expects
OpenSSL to reuse the configuration state in the SSL object but retain
connection state. This corresponds to the SSL_clear API.

The code currently only calls SSL_set_connect_state or
SSL_set_accept_state. Due to a quirk in OpenSSL, doing this causes the
handshake to implicitly SSL_clear the next time it is entered. However,
this, in the intervening time, leaves the SSL object in an odd state as
the connection state has not been dropped yet. This behavior also does
not appear to be documented by OpenSSL.

Instead, call SSL_clear explicitly:
https://www.openssl.org/docs/manmaster/man3/SSL_clear.html

(cherry picked from commit c6c74ce2652fd02527a1212e36cbfd788962132a)

5 years agobufferevent: refactor to use type check macros
Dominic Chen [Thu, 13 Apr 2017 18:58:13 +0000 (14:58 -0400)]
bufferevent: refactor to use type check macros

(cherry picked from commit 92cc0b9c3db38088f79c5d1e432c429fbc366968)

5 years agoFix arc4random_addrandom() detecting and fallback (regression)
Azat Khuzhin [Mon, 27 Mar 2017 12:50:23 +0000 (15:50 +0300)]
Fix arc4random_addrandom() detecting and fallback (regression)

But this is kind of hot-fix, we definitelly need more sane arc4random
compat layer.

Fixes: #488
Introduced-in: 6541168 ("Detect arch4random_addrandom() existence")
(cherry picked from commit 266f43af7798befa3d27bfabaa9ae699259c3924)

5 years agoMake event_count macros cleaner
Azat Khuzhin [Fri, 24 Mar 2017 08:49:59 +0000 (16:49 +0800)]
Make event_count macros cleaner

Fixes: #489
(cherry picked from commit 177e2171cb44e3929fbb0ec43b1bffb325b0e8ed)

5 years agofix evutil_make_internal_pipe_'s comment that fd[0] for read and f[1] for write
Xiang Zhang [Thu, 16 Mar 2017 15:32:43 +0000 (23:32 +0800)]
fix evutil_make_internal_pipe_'s comment that fd[0] for read and f[1] for write

(cherry picked from commit 2e52bace9f9998826bd3819af328efc8d18decf9)

5 years agocmake: use APPEND during exporting targets (for old cmake)
Azat Khuzhin [Tue, 14 Mar 2017 10:33:31 +0000 (13:33 +0300)]
cmake: use APPEND during exporting targets (for old cmake)

On centos with cmake 2.8.12.2:
  CMake Error at cmake/AddEventLibrary.cmake:92 (export):
    export called with target "event_extra_shared" which requires target
    "event_core_shared" that is not in the export list.

    If the required target is not easy to reference in this call, consider
    using the APPEND option with multiple separate calls.

But on newer cmake I guess everything is ok.

Fixes: 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED
and STATIC libraries (like autoconf does)")

(cherry picked from commit b1e8a4138f0da3c8a4bc303ff72b620b41c066d6)

5 years agoMerge branch 'win32-fixes'
Azat Khuzhin [Tue, 14 Mar 2017 10:31:02 +0000 (13:31 +0300)]
Merge branch 'win32-fixes'

This patchset fixes win32 builds after some previous patches (referenced
in particular commits), and also removes some quirks for win32.

* win32-fixes:
  test: do not return void
  log/win32: fix exporting extern variable
  log-internal: missing extern "C"
  log: remove USE_GLOBAL_FOR_DEBUG_LOGGING
  cmake: Export missing symbols for win32
  cmake: eliminate EVENT_BUILDING_REGRESS_TEST, since we link with shared libs
  test: windows doesn't have WNOWAIT
  cmake: clean not used #defines from event-config.h
  cmake: add <pthread.h> only for non-win32

(cherry picked from commit d84f0205453941235b0e04729098d4329c189bba)

5 years agocmake: fix pkgconfig generation (copy-paste typo)
Azat Khuzhin [Mon, 13 Mar 2017 18:40:52 +0000 (21:40 +0300)]
cmake: fix pkgconfig generation (copy-paste typo)

(cherry picked from commit 882f537c409d9c51ede581a3e13de7519227edb7)

5 years agoMerge branch 'cmake-missing-bits'
Azat Khuzhin [Mon, 13 Mar 2017 18:05:32 +0000 (21:05 +0300)]
Merge branch 'cmake-missing-bits'

This patchset adds next missing things (in compare to autotools):
- pkgconfig
- event_pthreads/event_openssl
- compile shared/static libraries always

And some fixes, because it will not build after fixing other things:
- export missing symbols for cmake (-fvisibility=hidden)

* cmake-missing-bits:
  cmake: support visibility for AppleClang too
  cmake: fix export absolute path and relative path and cleanup a bit
  cmake: generate and install pkgconfig files
  cmake: build SHARED and STATIC libraries (like autoconf does)
  cmake: add missing event_openssl/event_pthreads libraries
  Export symbols for -fvisibility=hidden (under cmake)

Refs: #246
(cherry picked from commit 489991a2b2628ba1ff4e6879b9f67ec35d224c38)

5 years agotravis-ci: do not run coverage on osx
Azat Khuzhin [Sun, 12 Mar 2017 10:12:53 +0000 (13:12 +0300)]
travis-ci: do not run coverage on osx

First of all we don't really need two of them, and also with apple-clang
it will fail (because of our checks in cmake), so just exclude it from
the build matrix.

(cherry picked from commit 83b1584700ec453e89017b5f12cf338a50b101b4)

5 years agoappveyor: remove -DEVENT__ENABLE_VERBOSE_DEBUG=ON build
Azat Khuzhin [Wed, 8 Mar 2017 20:48:30 +0000 (23:48 +0300)]
appveyor: remove -DEVENT__ENABLE_VERBOSE_DEBUG=ON build

See-also: c199df7bc78824ff579ff34c5f9f922034e8fa31 ("travis-ci: remove
-DEVENT__ENABLE_VERBOSE_DEBUG=ON (too much useless logs)")

(cherry picked from commit e01b993703f840a030e9b1cdcdc9b3fd448c77b2)

5 years agoFix detection of timerfd_create() in CMake.
Shuo Chen [Sun, 12 Mar 2017 09:00:41 +0000 (01:00 -0800)]
Fix detection of timerfd_create() in CMake.

(cherry picked from commit 65870949e7ce8110cb987cdeaa432c482cd9aabc)

5 years agoDo not add epoll_sub (syscall wrappers) for epoll in cmake
Azat Khuzhin [Wed, 8 Mar 2017 20:15:33 +0000 (23:15 +0300)]
Do not add epoll_sub (syscall wrappers) for epoll in cmake

Nowadays mostly all supported OS'es has this wrappers, and some of them (like
SmartOS) has wrappers but doesn't have __NR_epoll* defines for syscall numbers,
so just drop them (instead of adding yet another check int cmake like autotools
has, since this will break building in cross-compile environment).

Also one minor note, configure doesn't added epoll_sub.c either, since it check
epoll_create() in runtime.

And I tested it in SmartOS and it even works (`make verify`).

Fixes: #463
(cherry picked from commit 819d04937729b7f8b7c84d6c5c40c5fcd6d68dfd)

5 years agoMerge branch 'cmake-configure-fixes-v2'
Azat Khuzhin [Wed, 8 Mar 2017 14:58:26 +0000 (17:58 +0300)]
Merge branch 'cmake-configure-fixes-v2'

Fixes in cmake, to make it more like configure and support some
cross-compiling.

* cmake-configure-fixes-v2:
  cmake: fix extracting of the version from git (check for number of matches)
  Detect arch4random_addrandom() existence
  Use off_t instead of ev_off_t for sendfile() (fixes android build)
  cmake: detect _GNU_SOURCE not by __GNU_LIBRARY__ only (fallback to _GNU_SOURCE)
  Check for WNOWAIT in waitpid() in runtime (not in cmake/configure)
  cmake: add <pthread.h> into CMAKE_REQUIRED_INCLUDES for sizeof(pthread_t)
  cmake: fix values for #cmakedefine
  cmake: drop duplicates from event-config template
  cmake: add value for the #cmakedefine macros (like autoconf)
  cmake: Fix checking of enum values from sysctl.h

(cherry picked from commit 5aade2d30b6c5eff226cbf7b63fda5a01987ba4f)

5 years agotravis-ci: remove -DEVENT__ENABLE_VERBOSE_DEBUG=ON (too much useless logs)
Azat Khuzhin [Sun, 5 Mar 2017 23:52:46 +0000 (02:52 +0300)]
travis-ci: remove -DEVENT__ENABLE_VERBOSE_DEBUG=ON (too much useless logs)

I guess we can revert part of 59649f7 commit, we tried, but it adds more problems than solves.

Refs: https://github.com/libevent/libevent/pull/476#issuecomment-284259602
(cherry picked from commit c199df7bc78824ff579ff34c5f9f922034e8fa31)

5 years agoMerge branch 'fix-openssl-linking'
Azat Khuzhin [Sun, 5 Mar 2017 23:46:23 +0000 (02:46 +0300)]
Merge branch 'fix-openssl-linking'

* fix-openssl-linking:
  sample/https-client: use ERR_remove_*state() when we have them
  Do not check for ERR_remove_thread_state() (do not link ssl into every library)

Closes: #476
(cherry picked from commit 98faf19895bd6aa41c68f7da050179e207f05ae1)

5 years agoevutil: fix a typo of comment
tim-le [Sun, 5 Mar 2017 15:10:27 +0000 (23:10 +0800)]
evutil: fix a typo of comment

Fixes: #481
Fixes: #480
(cherry picked from commit 8df81546f3f25ac83888eca31843484703232492)

5 years agoFix RPATH for APPLE
Trond Norbye [Tue, 21 Feb 2017 11:54:02 +0000 (12:54 +0100)]
Fix RPATH for APPLE

By setting the CMake minimum version to 3.1 CMake automatically
adds the correct magic to make the library relocatable on
the filesystem (instead of burning the location of the library
at link time into the binary).

ex:
otool -L bin/http-connect
bin/http-connect:
@rpath/libevent_extra.2.2.0.dylib (compatibility version 2.2.0, current version 0.0.0)
/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.8)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1238.0.0)

Fixes: #468 (cherry-picked)
(cherry picked from commit cc0e04d798643b76ce1874213cb6cc3b2c6b5ac4)

5 years agosample/dns-example: fix compiler warning (getopt() returns an int)
David Disseldorp [Mon, 20 Feb 2017 15:55:57 +0000 (16:55 +0100)]
sample/dns-example: fix compiler warning (getopt() returns an int)

Signed-off-by: David Disseldorp <ddiss@suse.de>
Closes: #449
(cherry picked from commit 55cadb2b03c95505f6adbb836f0e975772d80bce)

5 years agosample/https-client: use host SSL certificate store by default
David Disseldorp [Mon, 20 Feb 2017 13:47:59 +0000 (14:47 +0100)]
sample/https-client: use host SSL certificate store by default

Currently a static (Debian) certificate path is used by default, which
can be overridden using the -crt parameter. This commit changes the
default behaviour such that the openssl default certificate store is
used, unless overridden by -crt.

Signed-off-by: David Disseldorp <ddiss@suse.de>
(cherry picked from commit e139cbac0a277cc4eff58bff345fbbcaf0858903)