]> granicus.if.org Git - libevent/log
libevent
7 years agocmake: add <pthread.h> only for non-win32
Azat Khuzhin [Mon, 13 Mar 2017 19:02:45 +0000 (22:02 +0300)]
cmake: add <pthread.h> only for non-win32

Fixes: b2b4b4d74e78a3e4fe7a74224d1e6aada5bde351 ("cmake: add <pthread.h>
into CMAKE_REQUIRED_INCLUDES for sizeof(pthread_t)")

7 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)

7 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

7 years agocmake: support visibility for AppleClang too
Azat Khuzhin [Mon, 13 Mar 2017 12:49:11 +0000 (15:49 +0300)]
cmake: support visibility for AppleClang too

Defaults apple linker behaviour is -two_levelnamespace, and you cannot
use "-undefined suppress" with it, so let's link non event_core with
event_core library to avoid undefined symbols.

7 years agocmake: fix export absolute path and relative path and cleanup a bit
Azat Khuzhin [Mon, 13 Mar 2017 00:18:02 +0000 (03:18 +0300)]
cmake: fix export absolute path and relative path and cleanup a bit

Remove next vars, since I don't think that somebody want to change it:
- bin
- lib
- include

And fix exports problem:
  CMake Error: INSTALL(EXPORT "LibeventTargets") given absolute DESTINATION "/usr/lib/cmake/libevent" but the export references an installation of target "event_core_static" which has relative DESTINATION "lib".

7 years agocmake: generate and install pkgconfig files
Azat Khuzhin [Sun, 12 Mar 2017 23:26:39 +0000 (02:26 +0300)]
cmake: generate and install pkgconfig files

Fixes: #443
7 years agocmake: build SHARED and STATIC libraries (like autoconf does)
Azat Khuzhin [Sun, 12 Mar 2017 20:31:59 +0000 (23:31 +0300)]
cmake: build SHARED and STATIC libraries (like autoconf does)

Since they are useful for debugging, and if autotools build them then
cmamke has to do this too, to make migration more simple.

And now:
- tests: uses shared libraries (since this is upstreams one)
- other binaries: uses static libraries

This removes next private config:
- EVENT__NEED_DLLIMPORT

7 years agocmake: add missing event_openssl/event_pthreads libraries
Azat Khuzhin [Sun, 6 Nov 2016 21:46:45 +0000 (00:46 +0300)]
cmake: add missing event_openssl/event_pthreads libraries

This will remove openssl requirement if you don't use it (i.e. if you
not link with openssl_pthreads).

Plus it fixes some linking dependencies:
- libm required only for test-ratelim

And fix some coding style alignment issues.

Refs: #246

7 years agoExport symbols for -fvisibility=hidden (under cmake)
Azat Khuzhin [Sun, 12 Mar 2017 17:50:35 +0000 (20:50 +0300)]
Export symbols for -fvisibility=hidden (under cmake)

Fixes: #442
7 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.

7 years agotravis-ci: use travis_retry to reduce number of problems with flacky tests
Azat Khuzhin [Thu, 9 Mar 2017 06:32:43 +0000 (09:32 +0300)]
travis-ci: use travis_retry to reduce number of problems with flacky tests

7 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)")

7 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.

7 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
7 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

7 years agocmake: fix extracting of the version from git (check for number of matches)
Azat Khuzhin [Mon, 6 Mar 2017 11:48:56 +0000 (14:48 +0300)]
cmake: fix extracting of the version from git (check for number of matches)

7 years agoDetect arch4random_addrandom() existence
Marek Sebera [Sun, 5 Mar 2017 21:55:16 +0000 (00:55 +0300)]
Detect arch4random_addrandom() existence

Refs: #370
Refs: #475

7 years agoUse off_t instead of ev_off_t for sendfile() (fixes android build)
Azat Khuzhin [Sun, 5 Mar 2017 21:45:09 +0000 (00:45 +0300)]
Use off_t instead of ev_off_t for sendfile() (fixes android build)

Refs: #475

7 years agocmake: detect _GNU_SOURCE not by __GNU_LIBRARY__ only (fallback to _GNU_SOURCE)
Azat Khuzhin [Sun, 5 Mar 2017 21:30:21 +0000 (00:30 +0300)]
cmake: detect _GNU_SOURCE not by __GNU_LIBRARY__ only (fallback to _GNU_SOURCE)

Fixes pipe2() on Android-9/armv7-a

Refs: #475

7 years agoCheck for WNOWAIT in waitpid() in runtime (not in cmake/configure)
Azat Khuzhin [Sun, 5 Mar 2017 21:05:50 +0000 (00:05 +0300)]
Check for WNOWAIT in waitpid() in runtime (not in cmake/configure)

Because checking in cmake breaks cross-compiling.

Introduced-in: 43eb56c7c738e3642f0981e3dd6ab9e082eec798.
Fixes: #482
Fixes: #462
Refs: #475

v2: use waitid() with WNOWAIT
v3: use WNOWAIT only if it available in waitpid(), because not all netbsd
    supports it

7 years agocmake: add <pthread.h> into CMAKE_REQUIRED_INCLUDES for sizeof(pthread_t)
Azat Khuzhin [Sun, 5 Mar 2017 19:07:23 +0000 (22:07 +0300)]
cmake: add <pthread.h> into CMAKE_REQUIRED_INCLUDES for sizeof(pthread_t)

Fixes: #475
7 years agocmake: fix values for #cmakedefine
Azat Khuzhin [Sun, 5 Mar 2017 18:58:20 +0000 (21:58 +0300)]
cmake: fix values for #cmakedefine

7 years agocmake: drop duplicates from event-config template
Azat Khuzhin [Sun, 5 Mar 2017 18:57:45 +0000 (21:57 +0300)]
cmake: drop duplicates from event-config template

7 years agocmake: add value for the #cmakedefine macros (like autoconf)
Azat Khuzhin [Sun, 5 Mar 2017 18:48:56 +0000 (21:48 +0300)]
cmake: add value for the #cmakedefine macros (like autoconf)

Before this patch for cmake we had:
  #define EVENT__HAVE_ACCEPT4
  /* #undef EVENT__HAVE_ARC4RANDOM */

While autotools has:
 #define EVENT__HAVE_ACCEPT4 1
 /* #undef EVENT__HAVE_ARC4RANDOM */

7 years agocmake: Fix checking of enum values from sysctl.h
Azat Khuzhin [Mon, 30 Jan 2017 00:17:41 +0000 (03:17 +0300)]
cmake: Fix checking of enum values from sysctl.h

CheckSymbolExists do not do this, so add new CheckConstExists that will
use CheckCSourceCompiles() to check this.

v2: use set() instead of string(APPEND)

7 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

7 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
7 years agosample/https-client: use ERR_remove_*state() when we have them
Pierce Lopez [Sun, 5 Mar 2017 16:33:44 +0000 (11:33 -0500)]
sample/https-client: use ERR_remove_*state() when we have them

ERR_remove_thread_state:
- openssl 0.9.8         does not have
- openssl 1.0/libressl  has
- openssl 1.1           deprecates

7 years agoDo not check for ERR_remove_thread_state() (do not link ssl into every library)
Pierce Lopez [Fri, 3 Mar 2017 02:09:32 +0000 (21:09 -0500)]
Do not check for ERR_remove_thread_state() (do not link ssl into every library)

This reverts commit c4e9d9bd662de7f575f2172c160795d452ebe709
("sample/https-client: check for ERR_remove_thread_state() existence").

Calling AC_SEARCH_LIBS() modifies LIBS - -lcrypto incorrectly
ends up in LIBS, and thus linked to by libevent_core.so.

Checking for ERR_remove_thread_state should no longer be needed
because it was introduced in openssl 1.0.0, and the previous line
0.9.8 had support discontinued at the end of 2015.

Fixes: #473
7 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
7 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)
7 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
7 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>
7 years agoFix clang 3 (some versions) misbehaviour for __has_attribute()
Azat Khuzhin [Sun, 29 Jan 2017 22:58:22 +0000 (01:58 +0300)]
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")

7 years agoUnbreak build with LibreSSL after openssl 1.1 support added
Jan Beich [Sat, 28 Jan 2017 16:42:13 +0000 (16:42 +0000)]
Unbreak build with LibreSSL after openssl 1.1 support added

Fixes: 3e9e0a0d46e4 ("Make it build using OpenSSL 1.1.0")
Fixes: #445
7 years agoMerge branch 'fix-struct-linger'
Azat Khuzhin [Sun, 29 Jan 2017 20:07:40 +0000 (23:07 +0300)]
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)
7 years agocmake: check for 'struct linger' existence
Azat Khuzhin [Sun, 29 Jan 2017 20:05:18 +0000 (23:05 +0300)]
cmake: check for 'struct linger' existence

7 years agotest/bench*: prefix event-config.h macros after 0dda56a48e94
Jan Beich [Sat, 28 Jan 2017 16:28:57 +0000 (16:28 +0000)]
test/bench*: prefix event-config.h macros after 0dda56a48e94

7 years agotest/bench_httpclient: restore SO_LINGER usage after 0dda56a48e94
Jan Beich [Sat, 28 Jan 2017 16:17:07 +0000 (16:17 +0000)]
test/bench_httpclient: restore SO_LINGER usage after 0dda56a48e94

7 years agoInclude openssl-compat.h into dist archive
Azat Khuzhin [Sun, 29 Jan 2017 18:37:31 +0000 (21:37 +0300)]
Include openssl-compat.h into dist archive

Refs: nmathewson/Libevent@140
Refs: http://archives.seul.org/libevent/users/Jan-2017/msg00001.html

7 years agoMake EVENT_STAGE_NAME non cached
Azat Khuzhin [Sun, 29 Jan 2017 17:19:06 +0000 (20:19 +0300)]
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.

7 years agoDo not overwrite version from GIT if it is older then defaults
Azat Khuzhin [Sun, 29 Jan 2017 16:32:10 +0000 (19:32 +0300)]
Do not overwrite version from GIT if it is older then defaults

7 years agoBump version in master to 2.2.0-alpha-dev
Azat Khuzhin [Sun, 29 Jan 2017 15:13:07 +0000 (18:13 +0300)]
Bump version in master to 2.2.0-alpha-dev

And according to f8d80a285cf941505277d9060d0357b5b7e543d2 ("Bump version
to 2.1.3-alpha-dev") numeric version have 1 at the end, since it means
"-dev".

7 years agoFix -Werror=implicit-fallthrough (fixes gcc-7)
Azat Khuzhin [Sun, 29 Jan 2017 14:23:14 +0000 (17:23 +0300)]
Fix -Werror=implicit-fallthrough (fixes gcc-7)

Fixes: #447
7 years agoMerge branch 'release-2.1.8-stable-pull' release-2.1.8-stable
Azat Khuzhin [Wed, 25 Jan 2017 23:37:15 +0000 (02:37 +0300)]
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

7 years agoBump version to 2.1.8-stable everywhere
Azat Khuzhin [Sun, 22 Jan 2017 15:21:57 +0000 (18:21 +0300)]
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")

7 years agoVERSION_INFO should me equal to library version
Azat Khuzhin [Sun, 22 Jan 2017 13:38:01 +0000 (16:38 +0300)]
VERSION_INFO should me equal to library version

This reverts commit 43243b9d55efcd0e6e2767a5c45bc7da46cff60c (I
shouldn't do this).

7 years agoBump whatsnew-2.1 document
Azat Khuzhin [Sun, 22 Jan 2017 13:58:12 +0000 (16:58 +0300)]
Bump whatsnew-2.1 document

7 years agoUpdate ChangeLog for 2.1.8-stable
Azat Khuzhin [Sun, 22 Jan 2017 13:16:58 +0000 (16:16 +0300)]
Update ChangeLog for 2.1.8-stable

$ git log --format='    o %s (%h %cN)' HEAD...refs/tags/release-2.1.7-rc

7 years agoREADME: update AUTHORS
Azat Khuzhin [Sun, 22 Jan 2017 13:14:30 +0000 (16:14 +0300)]
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 {}'

7 years agoMerge branch 'automake-tests-parallel-v4' (*includes ci bits also*)
Azat Khuzhin [Sun, 22 Jan 2017 00:59:02 +0000 (03:59 +0300)]
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
7 years agovagrant/netbsd: missing libtool
Azat Khuzhin [Sun, 22 Jan 2017 00:58:15 +0000 (03:58 +0300)]
vagrant/netbsd: missing libtool

7 years agoRun tests in parallel (they are lightweight), on CI and vagrant boxes
Azat Khuzhin [Fri, 20 Jan 2017 13:31:17 +0000 (16:31 +0300)]
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

7 years agotravis-ci: install cmake from xenial (CTEST_PARALLEL_LEVEL support)
Azat Khuzhin [Fri, 20 Jan 2017 13:50:04 +0000 (16:50 +0300)]
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
7 years agotest: register different tests in automake
Azat Khuzhin [Fri, 20 Jan 2017 13:29:19 +0000 (16:29 +0300)]
test: register different tests in automake

Before this patch we have one test.sh (well test-script.sh), and tooks
very long to run it sequentially, but they are pretty lightweight, so we
should run then in parallel.

7 years agotest: run different tests under different options (in a wrapper)
Azat Khuzhin [Fri, 20 Jan 2017 13:29:02 +0000 (16:29 +0300)]
test: run different tests under different options (in a wrapper)

7 years agoautomake: do not use serial-tests if parallel-test-harness available
Azat Khuzhin [Sun, 15 Jan 2017 09:31:27 +0000 (12:31 +0300)]
automake: do not use serial-tests if parallel-test-harness available

Revert: 61179dec7716975a151c6dae4524ae504d05780e ("automake: define
serial-tests only if automake have this option") Revert:
Revert: 44d755e00e249c09914cf35089c16735df82e270 ("test/automake: don't
use paralell test harness (since automake 1.12)")

7 years agoBump VERSION_INFO so that libraries symlinks will have the same version
Azat Khuzhin [Fri, 20 Jan 2017 18:24:54 +0000 (21:24 +0300)]
Bump VERSION_INFO so that libraries symlinks will have the same version

Fixes: f4489b8323cda0bf8eed7c1353911a852d7a947c ("Bump version to 2.1.7-beta
everywhere")

7 years agotest/dns: replace servname since solaris does not have "http"
Azat Khuzhin [Thu, 19 Jan 2017 23:11:35 +0000 (02:11 +0300)]
test/dns: replace servname since solaris does not have "http"

Yes, by default solaris (solaris10.dev 5.10 Generic_147148-26 i86pc i386 i86pc)
does not have "http" in /etc/services

7 years agoMerge branch 'openssl-filter-fixes-v4'
Azat Khuzhin [Thu, 19 Jan 2017 17:53:18 +0000 (20:53 +0300)]
Merge branch 'openssl-filter-fixes-v4'

* openssl-filter-fixes-v4:
  be: fix with filtered bufferevents and connect() without EAGAIN
  test/ssl: fix bufferevent_getfd() for bufferevent_openssl_filter_new()
  be_openssl: Fix writing into filted openssl bufferevent after connected
  test/https: separate cases for https client with filtered openssl bufferevent
  test/ssl: cover case when we writing to be_openssl after connecting

Fixes: #428
7 years agobe: fix with filtered bufferevents and connect() without EAGAIN
Azat Khuzhin [Sun, 15 Jan 2017 23:31:54 +0000 (02:31 +0300)]
be: fix with filtered bufferevents and connect() without EAGAIN

With filtered bufferevents (i.e. not real one, that have socket), we can
trigger incorrect callback in this case. Let's look at example with http
and bufferevent_openssl_filter_new():
- bev = bufferevent_openssl_filter_new()
- http layer trying to connect() to localhost with bev
  # at this time, bev have writecb/readcb NULL but ev_write/ev_read has
  # timeout with 45 secs, default HTTP connect timeout
- and when connect() retruns without EAGAIN (BSD'ism) we called
  event_active() before (with EV_WRITE), and this will call ev_write
  timeout only, while it is more correct to act on bufferevent instead
  of plain event, so let's trigger EV_WRITE for bufferevent which will
  do the job (and let's do this deferred).

Fixes: http/https_simple # under solaris
7 years agotest/ssl: fix bufferevent_getfd() for bufferevent_openssl_filter_new()
Azat Khuzhin [Wed, 7 Dec 2016 23:11:22 +0000 (02:11 +0300)]
test/ssl: fix bufferevent_getfd() for bufferevent_openssl_filter_new()

7 years agobe_openssl: Fix writing into filted openssl bufferevent after connected
Azat Khuzhin [Tue, 6 Dec 2016 23:53:07 +0000 (02:53 +0300)]
be_openssl: Fix writing into filted openssl bufferevent after connected

The main problems was due to when bufferevent_openssl has underlying (i.e.
created with bufferevent_openssl_filter_new()) some events was
disabled/suspended, while with openssl, READ can require WRITE and vice-versa
hence this issues.

The BEV_CTRL_GET_FD hunk to fix http subsystem, since it depends from what
bufferevent_getfd() returns.

Fixes: #428
Fixes: ssl/bufferevent_filter_write_after_connect
Fixes: http/https_filter_chunk_out
Fixes: da52933550fd4736aa1c213b6de497e2ffc31e34 ("be_openssl: don't call
do_write() directly from outbuf_cb")

7 years agotest/https: separate cases for https client with filtered openssl bufferevent
Azat Khuzhin [Wed, 7 Dec 2016 00:07:59 +0000 (03:07 +0300)]
test/https: separate cases for https client with filtered openssl bufferevent

- http/https_filter_chunk_out # now hang
- http/https_filter_basic     # works, since writes only before connect()

7 years agotest/ssl: cover case when we writing to be_openssl after connecting
Azat Khuzhin [Fri, 2 Dec 2016 15:32:03 +0000 (18:32 +0300)]
test/ssl: cover case when we writing to be_openssl after connecting

Right now it fails because of regression for filtered openssl
bufferevent, and by it I mean ssl/bufferevent_filter_write_after_connect
test, and by fails - hang.

Regression-for: da52933550fd4736aa1c213b6de497e2ffc31e34 ("be_openssl:
don't call do_write() directly from outbuf_cb")

7 years agotest/thread: netbsd is too slow, increase timeout for conditions_simple
Azat Khuzhin [Thu, 19 Jan 2017 17:51:38 +0000 (20:51 +0300)]
test/thread: netbsd is too slow, increase timeout for conditions_simple

7 years agotest/dns: run async resolving after sync one (to avoid timeouts)
Azat Khuzhin [Thu, 19 Jan 2017 17:34:41 +0000 (20:34 +0300)]
test/dns: run async resolving after sync one (to avoid timeouts)

If system resolver (sync one) will respond too slow, then we can fail async
request and evdns will retransmit tham again, but evdns server will accept that
failed requets, so we will have not 2 requests but 4.

Reproduced on centos box sometimes.

7 years agovagrant/netbsd: more reliable way of installing packages
Azat Khuzhin [Wed, 18 Jan 2017 11:33:56 +0000 (14:33 +0300)]
vagrant/netbsd: more reliable way of installing packages

Link: http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/doc/pkgsrc.html#installing-binary-packages
7 years agotest/http: turn off some tests that based on backlog filling (falky)
Azat Khuzhin [Sat, 7 Jan 2017 08:48:28 +0000 (11:48 +0300)]
test/http: turn off some tests that based on backlog filling (falky)

Since this technique does not work well everywhere, anyway it fails from time
to time.

See: https://travis-ci.org/libevent/libevent/jobs/186426446

8 years agoUpdate README.md
Breaker [Fri, 23 Dec 2016 08:19:35 +0000 (16:19 +0800)]
Update README.md

The default option of  EVENT__DISABLE_OPENSSL:BOOL is `OFF`

8 years agotest: fix util/date_rfc1123 under win32
Azat Khuzhin [Thu, 22 Dec 2016 11:55:33 +0000 (14:55 +0300)]
test: fix util/date_rfc1123 under win32

Refs: #417
v2: check when gmtime() returns NULL
v3: fix overflow cases

8 years agoFix UB in evutil_date_rfc1123()
Azat Khuzhin [Mon, 19 Dec 2016 07:22:51 +0000 (10:22 +0300)]
Fix UB in evutil_date_rfc1123()

As pointed in https://github.com/libevent/libevent/pull/417#issuecomment-267860738
  "code is unsafe because in evutil_date_rfc1123() the pointer to the
  automatic variable struct tm cur is used outside the scope it defined."

Checked with `clang -fsanitize=address -fsanitize-address-use-after-scope`
and test that call evutil_date_rfc1123() with tm==NULL

8 years agoMerge branch 'date-rfc1123'
Azat Khuzhin [Sun, 18 Dec 2016 22:26:43 +0000 (01:26 +0300)]
Merge branch 'date-rfc1123'

Follow RFC2616 (Date header should be in RFC1123 format).

But to reproduce this bug, program that uses libevent http-server should
call `setlocale(LC_ALL, "")` to properly initliaze locale, so that
strftime() retruns locale-specific dates.

* date-rfc1123:
  add tests for evutil_date_rfc1123().
  http: do not use local settings for Date header

Closes: #417
8 years agoadd tests for evutil_date_rfc1123().
Vis Virial [Fri, 16 Dec 2016 05:49:59 +0000 (14:49 +0900)]
add tests for evutil_date_rfc1123().

8 years agohttp: do not use local settings for Date header
Vis Virial [Thu, 10 Nov 2016 12:58:15 +0000 (21:58 +0900)]
http: do not use local settings for Date header

8 years agoFix incorrect MIME type
johnsonlee [Tue, 13 Dec 2016 03:54:09 +0000 (11:54 +0800)]
Fix incorrect MIME type

8 years agobe_openssl: make be_openssl_set_fd() static (no prototype required)
Azat Khuzhin [Tue, 6 Dec 2016 22:48:54 +0000 (01:48 +0300)]
be_openssl: make be_openssl_set_fd() static (no prototype required)

8 years agoMerge branch 'be-openssl-fd-reset-fix-v2'
Azat Khuzhin [Tue, 6 Dec 2016 22:43:35 +0000 (01:43 +0300)]
Merge branch 'be-openssl-fd-reset-fix-v2'

Two issues:
- dirty_shutdown for openssl 1.1
- BEV_CTRL_SET_FD for bufferevent_openssl didn't reset state

* be-openssl-fd-reset-fix-v2:
  Fix dirty_shutdown for openssl 1.1
  Fix reusing bufferevent_openssl after fd was reseted (i.e. on new connection)
  test/https: fix ssl dirty bypass for https_simple
  test/https: cover multiple request over the same connection
  test/http: sanity check for http_request_empty_done()

Reported-by: liutao74748@163.com
ML: http://archives.seul.org/libevent/users/Nov-2016/msg00041.html

8 years agoFix dirty_shutdown for openssl 1.1
Azat Khuzhin [Sat, 19 Nov 2016 15:00:36 +0000 (18:00 +0300)]
Fix dirty_shutdown for openssl 1.1

SSL_read() returns -1, even when underlying read() return 0

8 years agoFix reusing bufferevent_openssl after fd was reseted (i.e. on new connection)
Azat Khuzhin [Sat, 19 Nov 2016 14:08:53 +0000 (17:08 +0300)]
Fix reusing bufferevent_openssl after fd was reseted (i.e. on new connection)

For example if you trying to issue multiple requests over the same
evhttp_conneciton, and if connection already closed (IOW it should be
re-connected), than you will get into trouble since it will got wrong
openssl state. This patch addresses this issue by restoring state to
initial if SETFD called with -1 fd.

8 years agotest/https: fix ssl dirty bypass for https_simple
Azat Khuzhin [Sat, 19 Nov 2016 14:53:38 +0000 (17:53 +0300)]
test/https: fix ssl dirty bypass for https_simple

Tests:
- http/https_simple_dirty # not affected, since dirty is the default
- http/https_simple       # affected

v2: fix compilation with -DEVENT__DISABLE_OPENSSL=ON

8 years agotest/https: cover multiple request over the same connection
Azat Khuzhin [Sat, 19 Nov 2016 12:54:52 +0000 (15:54 +0300)]
test/https: cover multiple request over the same connection

Introduce two new tests:
- http/https_connection         # fail
- http/https_persist_connection # ok

Reported-by: liutao74748@163.com
8 years agotest/http: sanity check for http_request_empty_done()
Azat Khuzhin [Sat, 19 Nov 2016 14:11:35 +0000 (17:11 +0300)]
test/http: sanity check for http_request_empty_done()

8 years agoMerge branch 'openssl-1.1-init-fixes-v2'
Azat Khuzhin [Tue, 6 Dec 2016 22:14:24 +0000 (01:14 +0300)]
Merge branch 'openssl-1.1-init-fixes-v2'

* openssl-1.1-init-fixes-v2:
  sample/le-proxy: use TLS_method instead of SSLv23_method (latest deprecated)
  test: fix building under openssl 1.1 (init functions has been deprecated)
  le-proxy: fix building under openssl 1.1 (init functions has been deprecated)

Reported-by: varun.net@gmail.com
ML: http://archives.seul.org/libevent/users/Nov-2016/msg00002.html

8 years agosample/le-proxy: use TLS_method instead of SSLv23_method (latest deprecated)
Azat Khuzhin [Tue, 15 Nov 2016 22:16:30 +0000 (01:16 +0300)]
sample/le-proxy: use TLS_method instead of SSLv23_method (latest deprecated)

8 years agotest: fix building under openssl 1.1 (init functions has been deprecated)
Azat Khuzhin [Sun, 13 Nov 2016 23:17:51 +0000 (02:17 +0300)]
test: fix building under openssl 1.1 (init functions has been deprecated)

Refs: #397

8 years agole-proxy: fix building under openssl 1.1 (init functions has been deprecated)
Azat Khuzhin [Sun, 13 Nov 2016 23:17:38 +0000 (02:17 +0300)]
le-proxy: fix building under openssl 1.1 (init functions has been deprecated)

Refs: #397

8 years agohttps-cilent: fix compilation warnings about unused vars/functions on win32
Azat Khuzhin [Tue, 6 Dec 2016 10:26:09 +0000 (13:26 +0300)]
https-cilent: fix compilation warnings about unused vars/functions on win32

8 years agoFix _FILE_OFFSET_BITS redinition (solaris/autotools)
Azat Khuzhin [Tue, 6 Dec 2016 10:15:27 +0000 (13:15 +0300)]
Fix _FILE_OFFSET_BITS redinition (solaris/autotools)

So firstly include our header (config.h) -- <evconfig-private.h>, and
only after it <sys/types.h> since latest has #ifdef guard, while our
config.h is not inteded for this.

And besides all this thing with LARGE_FILE is a abit awkward, since we
don't nefine _LP64/_LP32 anyway, and so we have next error actually (64bit VS
32bit):
==> solaris: In file included from ./util-internal.h:30:0,
==> solaris:                  from test/regress_ssl.c:49:
  ==> solaris: ./evconfig-private.h:29:0: warning: "_FILE_OFFSET_BITS" redefined
  ==> solaris:  #define _FILE_OFFSET_BITS 64
  ==> solaris:  ^
  ==> solaris: In file included from /usr/include/sys/types.h:17:0,
  ==> solaris:                  from test/regress_ssl.c:38:
  ==> solaris: /opt/csw/lib/gcc/i386-pc-solaris2.10/5.2.0/include-fixed/sys/feature_tests.h:196:0: note: this is the location of the previous definition
  ==> solaris:  #define _FILE_OFFSET_BITS 32
  ==> solaris:  ^

For cmake it commented in: 8b228e27f57300be61b57a41a2ec8666b726dc34
("Lot's of cmake updates")

8 years agovagrant/osx: use make instead of gmake (there is no gmake)
Azat Khuzhin [Tue, 6 Dec 2016 10:06:08 +0000 (13:06 +0300)]
vagrant/osx: use make instead of gmake (there is no gmake)

$ make --version
GNU Make 3.81
Copyright (C) 2006  Free Software Foundation, Inc.
This is free software; see the source for copying conditions.
There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
PARTICULAR PURPOSE.

This program built for i386-apple-darwin11.3.0

8 years agoutil-internal: fix __func__ redefinition (netbsd)
Azat Khuzhin [Tue, 6 Dec 2016 09:08:32 +0000 (12:08 +0300)]
util-internal: fix __func__ redefinition (netbsd)

==> netbsd: In file included from ../listener.c:57:0:
==> netbsd: ../util-internal.h:58:0: warning: "__func__" redefined [enabled by default]
==> netbsd:  #define __func__ EVENT____func__
==> netbsd:  ^
==> netbsd: In file included from /usr/include/amd64/types.h:39:0,
==> netbsd:                  from /usr/include/sys/types.h:45,
==> netbsd:                  from ../listener.c:30:
==> netbsd: /usr/include/sys/cdefs.h:394:0: note: this is the location of the previous definition
==> netbsd:  #define __func__ __PRETTY_FUNCTION__

8 years agoFix signedness differ for iov_base (solaris)
Azat Khuzhin [Tue, 6 Dec 2016 08:55:44 +0000 (11:55 +0300)]
Fix signedness differ for iov_base (solaris)

8 years agoevutil_time: include <unistd.h> when there is only sleep()/usleep()
Azat Khuzhin [Tue, 6 Dec 2016 08:58:16 +0000 (11:58 +0300)]
evutil_time: include <unistd.h> when there is only sleep()/usleep()

8 years agohttp: fix formatter for pritnf for req->ntoread (osx)
Azat Khuzhin [Tue, 6 Dec 2016 08:51:18 +0000 (11:51 +0300)]
http: fix formatter for pritnf for req->ntoread (osx)

8 years agosample/http-connect: fix compilation with VS2010
Azat Khuzhin [Tue, 6 Dec 2016 06:54:13 +0000 (09:54 +0300)]
sample/http-connect: fix compilation with VS2010

Fixes: nmathewson/Libevent#137
8 years agoC90 doesn't like declarations intermingled with statements
Philip Prindeville [Sat, 12 Nov 2016 00:51:37 +0000 (17:51 -0700)]
C90 doesn't like declarations intermingled with statements

So move all of the declarations to the top of the offending function.

This patch includes both of issues (Fixes:), from @jeking3 and
@pprindeville

Fixes: #418
Fixes: nmathewson/Libevent#136
8 years agovagrant: add centos box
Azat Khuzhin [Fri, 18 Nov 2016 17:27:49 +0000 (20:27 +0300)]
vagrant: add centos box

Packages list get from here:
  https://pkgs.org/search/

Refs: #424

8 years agoMerge remote-tracking branch 'azat/release-2.1.7-rc-pull' release-2.1.7-rc
Azat Khuzhin [Fri, 4 Nov 2016 22:35:26 +0000 (01:35 +0300)]
Merge remote-tracking branch 'azat/release-2.1.7-rc-pull'

Finally 2.1 release candidate is out!

* azat/release-2.1.7-rc-pull:
  Bump version to 2.1.7-beta everywhere
  Update changelog for 2.1.7-rc
  README: update AUTHORS

8 years agoBump version to 2.1.7-beta everywhere
Azat Khuzhin [Tue, 1 Nov 2016 21:31:31 +0000 (00:31 +0300)]
Bump version to 2.1.7-beta everywhere

- cmake basic
- cmake detecting from git -- event_fuzzy_version_from_git()
- autotools
- win32
- appveyor

8 years agoUpdate changelog for 2.1.7-rc
Azat Khuzhin [Tue, 1 Nov 2016 21:25:38 +0000 (00:25 +0300)]
Update changelog for 2.1.7-rc