3896 Commits

Author SHA1 Message Date
Azat Khuzhin
21bfaa702f
Merge branch 'official/pr/671' -- README cleanup
* official/pr/671:
  Capitalise project names consistently in README.md
  Indent configure flag section to make markdown format them as code
  Use https for resources that support it
  Rewords awkward sentences in README.md
  Fix typos in README.md

(cherry picked from commit c3a6fe75e1511a4c7a7a6ef0a5954b1918902933)
2019-02-02 15:17:58 +03:00
Azat Khuzhin
d7579fb958
autotools: include win32 specific headers for socklen_t detection on win32/mingw
The [1] removes EVENT__ prefix, and now if we will incorrectly detect
that "foobar" (or socklen_t in our case) type is not available, but
somewhere later it will be available then we will get next error [2]:
  error: two or more data types in declaration specifiers

According to [3]:
- Compile something in Cygwin and you are compiling it for Cygwin.
- Compile something in MinGW and you are compiling it for Windows.
  And I can confirm this, since there is _WIN32 defined (according to [4])

And since according to [5] our image in appveyour (Visual Studion 2015)
has mingw (and we use it, not cygwin) we need ws2tcpip.h (over
sys/socket.h -- which does not exist in win32) header to detect
socklen_t existence.

[1]: 587e9f5828c4eb3c6e79e9eb29f174e4ae0c05bd ("config.h can't be prefixed unconditionally")
[2]: https://ci.appveyor.com/project/nmathewson/libevent/build/job/yonukoc5q3tr3e5e#L372
[3]: https://stackoverflow.com/questions/771756/what-is-the-difference-between-cygwin-and-mingw
[4]: https://www.appveyor.com/docs/build-environment/#mingw-msys-cygwin
[5]: https://ci.appveyor.com/project/nmathewson/libevent/build/job/yonukoc5q3tr3e5e#L164

Fixes: #649
(cherry picked from commit 4728ffed865985ab663b2e067afb904d124fc1db)
2019-02-02 15:17:58 +03:00
Azat Khuzhin
9bcfcbda95
appveyor: disable almost all configurations (except autotools/cmake basic)
Since we have FREE plan, we have a lot of limits on our builds, so let's
reduce their amount to make them run/start faster (I hope).

(cherry picked from commit bdd531288affe9fa46184bb9b492defbcf379c63)
2019-02-02 15:17:58 +03:00
Xiaozhou Liu
aade513b4e
Fix typo
Closes: #658
(cherry picked from commit 30d77f1b59bcd1433a89e803b9fa045c50883868)
2019-02-02 15:17:58 +03:00
Nathan French
0d5dde5357
[http] fix C90 warnings
(cherry picked from commit 514dc7579c43e673bdf613e01690371438661260)
2019-02-02 15:17:57 +03:00
Philip Prindeville
061823b147
Tell Travis to use quiet git clone
Otherwise the logs show a bunch of pointless progress, which is
really only useful for interactive sessions.

Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Closes: #651 (cherry-picked)
(cherry picked from commit 24236aed01798303745470e6c498bf606e88724a)
2019-02-02 15:17:57 +03:00
Leo Zhang
780eaac827
test: make regress_dns C89 compatible
Closes: #635 (cherry-picked)
(cherry picked from commit d9ffd2213702bc22c467bd83c230a1a5e97e9e67)
2019-02-02 15:17:57 +03:00
Azat Khuzhin
37423849e6
Ignore evconfig-private.h for autotools
Fixes: e2874d95af584b3657eb5dc1d2e5404811dce117 ("Adopt ignore rules for
cmake + ninja")

(cherry picked from commit 064a598716e69a1ac3937dd1bbc74194d0f3d3cf)
2019-02-02 15:17:57 +03:00
Azat Khuzhin
85fed75f7e
Replace all EVENT_HAVE with EVENT__HAVE (EVENT__HAVE_USLEEP)
(cherry picked from commit 35258a1f4e09d9e7fcb003cd0572343670180495)
2019-02-02 15:17:57 +03:00
Philip Prindeville
06ec5de615
Add convenience macros for user-triggered events
Signed-off-by: Philip Prindeville <philipp@redfish-solutions.com>
Closes: #647 (picked)
(cherry picked from commit d2acf67ec3ad2916236396992f094c0c65016028)
2019-02-02 15:17:57 +03:00
Philip Prindeville
8ab60087c3
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)
2019-02-02 15:17:57 +03:00
an-tao
00761b436d
fix spelling mistakes
Closes: nmathewson/Libevent#162
(cherry picked from commit 0789bc5220af6eaa9b483afcd1405be6f01d2187)
2019-02-02 15:17:57 +03:00
Philip Prindeville
63a054f8c6
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)
2019-02-02 15:17:57 +03:00
Azat Khuzhin
e2732c9063
Make rpc headers self-compilable
Fixes: #633
(cherry picked from commit c57f5c34903b02c6e7378865f71a2b83a5befb96)
2019-02-02 15:17:57 +03:00
Azat Khuzhin
d9d1c09e25
Notify event base if there are no more events, so it can exit without delay
Fixes: #623
(cherry picked from commit 23c2914f6b430f2c2d74c267c13ffab3dda1b325)
2019-02-02 15:17:56 +03:00
Azat Khuzhin
44fa5b19f7
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)
2019-02-02 15:17:56 +03:00
Azat Khuzhin
0d194c4e49
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)
2019-02-02 15:17:56 +03:00
Azat Khuzhin
dfb5fc1675
travis-ci: allow tests under osx to fail (temporary, until we will fix them)
(cherry picked from commit da028dec497722793ada3ce1a0358c1bf68161de)
2019-02-02 15:17:56 +03:00
Azat Khuzhin
61b95600a0
test/http: cover evhttp_connection_get_addr() for incomming connections
Refs: #510
(cherry picked from commit e4edc7fc27bb96b4811f1c24d591f5c5bca69bdd)
2019-02-02 15:17:56 +03:00
Greg Hazel
4215c003f1
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)
2019-02-02 15:17:56 +03:00
Azat Khuzhin
f3eb294f79
test/dns: verify bufferevent_socket_connect() errorcb invoking if socket() fails
Refs: #600
(cherry picked from commit a3d8f2e09302536c6c0ffc3ccb1fc6f43b51dc4f)
2019-02-02 15:17:56 +03:00
Jesse Fang
1dde74efa8
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)
2019-02-02 15:17:56 +03:00
Azat Khuzhin
442c7d947f
test/dns: cleanup test_bufferevent_connect_hostname()
(cherry picked from commit 623ef3ccdc0aafac7ae77a723cbad6d552ff9a01)
2019-02-02 15:17:56 +03:00
Azat Khuzhin
7e56c8b2da
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)
2019-02-02 15:17:55 +03:00
Azat Khuzhin
3ffa3ca7f7
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)
2019-02-02 15:17:55 +03:00
SuckShit
d632610468
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)
2019-02-02 15:17:55 +03:00
The Gitter Badger
8886eed498
Add Gitter badge
(cherry picked from commit ba78ba9e8ba4c964dd5d14a281d7421c95d37937)
2019-02-02 15:17:55 +03:00
Philip Herron
29590718cf
cmake: ensure windows dll's are installed as well as lib files
Closes: #621
(cherry picked from commit 0fa43c99fbba6f3b1827ada98302f548206a358f)
2019-02-02 15:17:55 +03:00
dpayne
3bd2ce439d
Generating evdns_base_config_windows_nameservers docs on all platforms
(cherry picked from commit 791e3de0c38f9f413f33addcac2d8bca68590ca6)
2019-02-02 15:17:55 +03:00
dpayne
80b70ee029
Fixing doxygen docs for evdns_base_search_clear when generated on non-windows machines
(cherry picked from commit 2c1562949c49febe9a4d5ec33cabe99f1f6a82e1)
2019-02-02 15:17:55 +03:00
Bernard Spil
894ca48a11
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)
2019-02-02 15:17:55 +03:00
Philip Prindeville
8818c86caf
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)
2019-02-02 15:17:55 +03:00
Greg Hazel
b92b07924d
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)
2019-02-02 15:17:55 +03:00
Greg Hazel
ebfac51797
Call underlying bev ctrl GET_FD on filtered bufferevents
Fixes: #611
Fixes: #610
(cherry picked from commit 4055081499cba32642dd72427a8f9d3ad7e50e79)
2019-02-02 15:17:54 +03:00
Azat Khuzhin
4f0f40e31e
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)
2019-02-02 15:17:54 +03:00
Azat Khuzhin
f45543e2f8
Convert event_debug_*() helpers from macros to static functions
(cherry picked from commit f0fd92f2c41fd5bf3b270ee338089dd9329d0354)
2019-02-02 15:17:54 +03:00
stenn
2f060c5f23
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)
2019-02-02 15:15:15 +03:00
Azat Khuzhin
0dfabd347e
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)
2019-02-02 15:13:55 +03:00
Azat Khuzhin
2b4d127dbe
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)
2019-02-02 15:13:55 +03:00
Dmitry Alimov
6200b821eb
Fix typos in comments
(cherry picked from commit f24b28e4aff1dbc3440e283f70ac15aa7cebcc8d)
2019-02-02 15:13:55 +03:00
Azat Khuzhin
123362e9a8
http: fix leaks in evhttp_uriencode()
Fixes: #584
(cherry picked from commit 61c21492680505706cad9240c39666ee3b56a89c)
2019-02-02 15:13:55 +03:00
Azat Khuzhin
df2ed13f8f
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)
2019-02-02 15:13:55 +03:00
Marcin Szewczyk
caceb8f558
Fixed last_with_datap description
Grammar and typo fix

(cherry picked from commit 88a1abe809e5d29618b722ff81ee2fb14119314f)
2019-02-02 15:13:55 +03:00
Azat Khuzhin
3375750ad7
Fix typo in cmake because of which EVENT__SIZEOF_SIZE_T was wrong
Fixes: #580
(cherry picked from commit 6e5c15d095d37036553d491b52d27fbbda08e7f2)
2019-02-02 15:13:55 +03:00
Greg Hazel
7d1ffe6474
CONNECT method only takes an authority
(cherry picked from commit 65eb529a9f4dd886d01a9d77ce6d971de9fb1b97)
2019-02-02 15:13:55 +03:00
yongqing.jiao
27dee54d03
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)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
42e851bb8c
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)
2019-02-02 15:13:54 +03:00
Andrey Okoshkin
7fa08c4b75
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)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
01bc36c1f4
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)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
27b59783f3
Free dns/event bases in dns-example to avoid leaks
(cherry picked from commit 33e363f3dfcd21f5125134395e4a7b3531bc3066)
2019-02-02 15:13:54 +03:00