3823 Commits

Author SHA1 Message Date
Azat Khuzhin
802be13afd
Fix event_debug_logging_mask_ exporting on win32
(cherry picked from commit cd285e425a906276efafab901d1b9da0e388be48)
2019-02-02 15:13:52 +03:00
Azat Khuzhin
a1f28e2f9c
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)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
6f74954017
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)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
3e69029008
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)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
d2a41a50a8
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)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
449f5a5746
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)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
c544222f19
http-connect: exit on error
(cherry picked from commit d22e12eefa11aab34b95e8b07b823f3ad0597239)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
300a0dc6e0
test: do not use .fieldname in structure initializations (fixes win32)
Fixes: #497
(cherry picked from commit 15da23cfdbeb5d5b4eeafca0cd93962c26641ae5)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
822d646276
Add missing print-winsock-errors.c into dist archive
Refs: #497
(cherry picked from commit 8d89c212587c560df8cd7089fb1a2fcd2a3dca82)
2019-02-02 15:13:51 +03:00
Maximilian Brunner
56a520035b
le-proxy: add missing return statement (UAF)
Refs: #501501501501501501501501501
(cherry picked from commit 00ae45fe53e9e01f61f97c90deba1deb6ac1bc9f)
2019-02-02 15:13:51 +03:00
José Luis Millán
876c7ac7ff
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)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
23db747652
test: cover that after event_del() callback will not be scheduled again
Refs: #236
Refs: #225
(cherry picked from commit 5ff83989f30daef93a851c2162667375ed1663a5)
2019-02-02 15:13:50 +03:00
Gonçalo Ribeiro
5dbcae8578
Correct URL for the libevent logo
(cherry picked from commit f988c5ca0eb654a8e60df174abfc63dd9476be5e)
2019-02-02 15:13:50 +03:00
David Benjamin
29b7a516fd
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)
2019-02-02 15:13:50 +03:00
Dominic Chen
56faf02bae
bufferevent: refactor to use type check macros
(cherry picked from commit 92cc0b9c3db38088f79c5d1e432c429fbc366968)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
303d6d77c7
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)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
27a2ef5c8b
Make event_count macros cleaner
Fixes: #489
(cherry picked from commit 177e2171cb44e3929fbb0ec43b1bffb325b0e8ed)
2019-02-02 15:13:50 +03:00
Xiang Zhang
7f0a7564c3
fix evutil_make_internal_pipe_'s comment that fd[0] for read and f[1] for write
(cherry picked from commit 2e52bace9f9998826bd3819af328efc8d18decf9)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
5398cbcded
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)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
ebd12e6de7
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)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
cc554d87ce
cmake: fix pkgconfig generation (copy-paste typo)
(cherry picked from commit 882f537c409d9c51ede581a3e13de7519227edb7)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
9806b12637
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)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
d914115cd9
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)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
c785e1dbad
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)
2019-02-02 15:13:49 +03:00
Shuo Chen
e50af3315a
Fix detection of timerfd_create() in CMake.
(cherry picked from commit 65870949e7ce8110cb987cdeaa432c482cd9aabc)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
cea61de609
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)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
a0bfe2c451
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)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
0864138a8f
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)
2019-02-02 15:13:49 +03:00
Azat Khuzhin
e7bd9e0380
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)
2019-02-02 15:13:49 +03:00
tim-le
8dddccd019
evutil: fix a typo of comment
Fixes: #481
Fixes: #480
(cherry picked from commit 8df81546f3f25ac83888eca31843484703232492)
2019-02-02 15:13:48 +03:00
Trond Norbye
45b1f379d4
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)
2019-02-02 15:13:48 +03:00
David Disseldorp
d3e1c440c9
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)
2019-02-02 15:13:48 +03:00
David Disseldorp
5c0132f315
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)
2019-02-02 15:13:48 +03:00
Azat Khuzhin
df01f798c2
Fix clang 3 (some versions) misbehaviour for __has_attribute()
Refs: #447
Clang: https://reviews.llvm.org/rL223468 ("Modify __has_attribute so
that it only looks for GNU-style attributes")

(cherry picked from commit ffbce578c40a06491ce6585ab2d82ebb69a52d30)
2019-02-02 15:13:48 +03:00
Jan Beich
230af9f0e8
Unbreak build with LibreSSL after openssl 1.1 support added
Fixes: 3e9e0a0d46e4 ("Make it build using OpenSSL 1.1.0")
Fixes: #445
(cherry picked from commit d057c45e8f48aa90d8b340cac4c8ae4cc8b5d0ac)
2019-02-02 15:13:48 +03:00
Azat Khuzhin
8567f2f56e
Merge branch 'fix-struct-linger'
@jbech
  "Accidentally disabled by 0dda56a due to confusion between struct
  linger vs. SO_LINGER and #define vs. AC_DEFINE. Try adding synthetic
  #error test to confirm."

* fix-struct-linger:
  cmake: check for 'struct linger' existence
  test/bench*: prefix event-config.h macros after 0dda56a48e94
  test/bench_httpclient: restore SO_LINGER usage after 0dda56a48e94

Fixes: #444 (original pull-request)
(cherry picked from commit 9d5a4bdc5cfbf2385efc7c58103161b3512c4500)
2019-02-02 15:13:48 +03:00
Azat Khuzhin
0865813619
Include openssl-compat.h into dist archive
Refs: nmathewson/Libevent@140
Refs: http://archives.seul.org/libevent/users/Jan-2017/msg00001.html
(cherry picked from commit 7bc822cad9d06775e366e6c5ac523b13522a6a81)
2019-02-02 14:19:24 +03:00
Azat Khuzhin
d9d11cb2e9
Make EVENT_STAGE_NAME non cached
It did not work before correctly anyway, since cmake do not reset cache
entries by default, so that reset to "beta" didn't work.

But I don't think that making this variable cached is useful, so let's
remove this.

(cherry picked from commit fe2c2622c389d7e9529b3c2fa828fb69cc985a1e)
2019-02-02 14:19:09 +03:00
Azat Khuzhin
3a1f47fd1d
Do not overwrite version from GIT if it is older then defaults
(cherry picked from commit 0344edf62dc49d822315a8d832f17be8d2c43643)
2019-02-02 14:16:49 +03:00
Azat Khuzhin
40da44bd9b
Fix -Werror=implicit-fallthrough (fixes gcc-7)
Fixes: #447
(cherry picked from commit 94e7dcebc320bf496ff6b613d8e4b771fa0a161c)
2019-02-02 14:16:19 +03:00
Azat Khuzhin
e7ff4ef2b4 Merge branch 'release-2.1.8-stable-pull'
* release-2.1.8-stable-pull:
  Bump version to 2.1.8-stable everywhere
  VERSION_INFO should me equal to library version
  Bump whatsnew-2.1 document
  Update ChangeLog for 2.1.8-stable
  README: update AUTHORS
release-2.1.8-stable
2017-01-26 02:37:15 +03:00
Azat Khuzhin
9b63b5d410 Bump version to 2.1.8-stable everywhere
P.S. in referenced commit I made a mistake and instead of *-rc* I wrote
*-beta*.

See-also: f4489b8323cda0bf8eed7c1353911a852d7a947c ("Bump version to
2.1.7-beta everywhere")
2017-01-26 02:36:00 +03:00
Azat Khuzhin
bed52ff6ff VERSION_INFO should me equal to library version
This reverts commit 43243b9d55efcd0e6e2767a5c45bc7da46cff60c (I
shouldn't do this).
2017-01-26 02:36:00 +03:00
Azat Khuzhin
227bfe5626 Bump whatsnew-2.1 document 2017-01-26 02:36:00 +03:00
Azat Khuzhin
d9eb42e082 Update ChangeLog for 2.1.8-stable
$ git log --format='    o %s (%h %cN)' HEAD...refs/tags/release-2.1.7-rc
2017-01-26 02:36:00 +03:00
Azat Khuzhin
50824ae2a0 README: update AUTHORS
$ git log --format='%an' HEAD...refs/tags/release-2.1.6-beta | sort -u | xargs -n1 -i bash -c 'fgrep -q "{}" README.md || echo {}'
2017-01-22 16:14:30 +03:00
Azat Khuzhin
59e217dfe1 Merge branch 'automake-tests-parallel-v4' (*includes ci bits also*)
This patch set runs tests in parallel (on travis/appveyor/vagrant), it
includes cmake/autotools(automake).

It should significantly decrease time that tests tooks on travis-ci (3-4
times lower, right now it is about 14-17 hours - too long!), but not
without downsides, now because travis-ci workers has limited resources
we will have more timing-related failures, but this is another storry,
anyway ~16 hours is not acceptable. Anyway if machine has enough
resources it is great to have ability to run tests in parallel (which
automake couldn't do before).

Changes for common test env:
- autotools: before 17m / after 3m
- cmake:     before 15m / after 87 sec

* automake-tests-parallel-v4:
  Run tests in parallel (they are lightweight), on CI and vagrant boxes
  travis-ci: install cmake from xenial (CTEST_PARALLEL_LEVEL support)
  test: register different tests in automake
  test: run different tests under different options (in a wrapper)
  automake: do not use serial-tests if parallel-test-harness available

Fixes: #439
2017-01-22 04:12:04 +03:00
Azat Khuzhin
9c9be3994d vagrant/netbsd: missing libtool 2017-01-22 03:58:15 +03:00
Azat Khuzhin
108b5fef41 Run tests in parallel (they are lightweight), on CI and vagrant boxes
By default 20 parllel jobs, but one caveat for travis-ci, osx boxes
there slower and have less resources then linux (discovered during
testing), so limit number of parallel jobs to 4 there, and also install
travis_wait, so that travis-ci will not fail the build when there is no
output for 10 minutes, since for osx boxes it is very likely.

Refs: travis-ci/travis-ci@7202
2017-01-22 03:22:27 +03:00
Azat Khuzhin
2a67f4fc12 travis-ci: install cmake from xenial (CTEST_PARALLEL_LEVEL support)
cmake supports it since 3.0 I guess.

And it must be trusty (not precise), otherwise it fails:
  dpkg: error processing
  /var/cache/apt/archives/ifupdown_0.8.10ubuntu1_amd64.deb (--unpack):
   trying to overwrite '/etc/init.d/networking', which is also in package netbase 4.47ubuntu1

Link: https://travis-ci.org/azat/libevent/jobs/193744023
2017-01-22 03:22:27 +03:00