4183 Commits

Author SHA1 Message Date
Azat Khuzhin
87fa93a8e6
Merge remote-tracking branch 'official/pr/804'
* official/pr/804:
  Added test for evmap slot validations.
  Prevent endless loop in evmap_make_space.
  Enforce limit of NSIG signals.

(cherry picked from commit c6becb26cad8dab2668fe3d913e5ee757bade2fd)
2019-05-25 21:25:12 +03:00
Tobias Stoeckmann
0b46bb8cc9
Protect min_heap_push_ against integer overflow.
Converting unsigned to size_t for size of memory objects allows
proper handling of very large heaps on 64 bit systems.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Closes: #799 (cherry-picked)
(cherry picked from commit 176fd5665512db95b1cf38fc647a7c706d80c14d)
2019-05-25 21:25:12 +03:00
linxiaohui
2a1e153035
le-proxy: initiate use of the Winsock DLL
Closes: #803 (cherry-picked)
(cherry picked from commit 16d8564a2cd2ec665b577f39eea6583d4b651e92)
2019-05-25 21:25:12 +03:00
Azat Khuzhin
d83a517c4d
Remove experimental note for finalizers API
(cherry picked from commit 55f9863b18fe21ddd220d98941b7ac777593dde5)
2019-05-25 21:25:12 +03:00
Azat Khuzhin
c0adad8fe4
https-client: do not try to free not initialized base
Otherwise:
  $ https-client --help
  Syntax:
     https-client -url <https-url> [-data data-file.bin] [-ignore-cert] [-retries num] [-timeout sec] [-crt crt]
  Example:
     https-client -url https://ip.appspot.com/
  [warn] event_base_free_: no base to free
(cherry picked from commit 428f36e5dd8f2a45ea5795fb9f35dd27a776e3a8)
2019-05-25 21:25:12 +03:00
Azat Khuzhin
5185347236
http: drop unused internal macros
(cherry picked from commit 35caeff5deacd5e081a4e6220b9226b61e24208d)
2019-05-25 21:25:12 +03:00
Azat Khuzhin
89932001f2
Disable logging for tests that assume printing warnings
To avoid possible confusion

But there is still one test that has some messages on windows:
  main/methods

Because this test needs >1 of avaiable methods, otherwise it will warn.

(cherry picked from commit 47d348a63130c91f2a6aadef291ff5687275df72)
2019-05-25 21:25:12 +03:00
Azat Khuzhin
17eee0e47d
appveyor: check intermediate powershell commands exit codes and terminate early
Otherwise build errors will be ignored, i.e. if build fails but regress
binary exists (copied from artifacts) it will be runned instead of newly
compiled.

(cherry picked from commit 93a925474d22b94e5ad75a48656033e55efe9055)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
c010069b0b
Merge branch 'fix-uchex-warnings'
There is one more report that is false positive, see [1]:
  "In bufferevent_openssl.c, pointer wm is dereferenced on line 871
before it is null checked on line 873."

  [1]: https://github.com/libevent/libevent/issues/382#issuecomment-238081938

* fix-uchex-warnings:
  evdns: do not check server_req twice
  evrpc: do not check req twice

Fixes: #382
(cherry picked from commit da33f768e451f1b5722b7426e03c87e260ee43d0)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
58e81106ad
evdns: add DNS_OPTION_NAMESERVERS_NO_DEFAULT/EVDNS_BASE_NAMESERVERS_NO_DEFAULT
- DNS_OPTION_NAMESERVERS_NO_DEFAULT
  Do not "default" nameserver (i.e. "127.0.0.1:53") if there is no nameservers
  in resolv.conf, (iff DNS_OPTION_NAMESERVERS is set)

- EVDNS_BASE_NAMESERVERS_NO_DEFAULT
  If EVDNS_BASE_INITIALIZE_NAMESERVERS isset, do not add default
  nameserver if there are no nameservers in resolv.conf (just set
  DNS_OPTION_NAMESERVERS_NO_DEFAULT internally)

Fixes: #569
(cherry picked from commit e5b8f4c1925867d8e4cd7dc0390e5141d7ef1106)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
aa5a65d194
evdns: add descriptions for DNS_OPTION_*/DNS_OPTIONS_ALL
(cherry picked from commit 3e0dc1a6ab4b7024b93dc44c1bb79df0ef637fc0)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
22380996db
Link test/regress with event_core/event_extra over event
Due to regress linked with event and event_core (both of them includes
evthread.c) there will be two different evthread_id_fn_ variables under
mingw64:
  evthread_id_fn_: &0x5294f20a8
  evthread_id_fn_: &0x4ba0030a8

And because of this evthread_use_pthreads() can/will set one copy of
variables while evthread*() functions will access another, which will
break a lot of things (for example main/del_notify test).

Fixes: #792
(cherry picked from commit 2ae875ed1216a8896d8af0414cb4efbcb907bae5)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
d89045a65d
signal: guard __cdecl definition with #ifdef
Under mingw64:
  ../signal.c:88:0: warning: "__cdecl" redefined
   #define __cdecl

  <built-in>: note: this is the location of the previous definition

https://ci.appveyor.com/project/azat/libevent/builds/23321613#L427
(cherry picked from commit b8e2f01690c07f7b6eb29d097b30c1640fc9612e)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
75d7e1ff8f
tinytest: fix parsing --timeout argument
Fixes: 15b2f41d ("tinytest: implement per-test timeout (via alarm() under !win32 only)")
(cherry picked from commit 8a674243b444da9e0742ac837334aaf38e6a703a)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
b64dbfb61b
tinytest: implement per-test timeout (via alarm() under !win32 only)
(cherry picked from commit 15b2f41d748643393b9f95b790d32e6bbbf38062)
2019-05-25 21:25:11 +03:00
Azat Khuzhin
bb0f8fe7d5
Fix leaks in error path of the bufferevent_init_common_()
(cherry picked from commit 6995b9a864c16bcb84ea0f7a2cf856143020316b)
2019-05-25 21:25:10 +03:00
Azat Khuzhin
b6724b6059
bench: suppress int conversion warnings
(cherry picked from commit efcc18442b338d931f6dfe71d5ebaff3c6fa2b03)
2019-05-25 21:25:10 +03:00
Azat Khuzhin
7c669cc7e8
Suppress int conversion warnings in getopt_long compatibility
(cherry picked from commit 61e4a651d7054d41c8669c2a5340679b64f6ecf6)
2019-05-25 21:25:10 +03:00
Azat Khuzhin
b062bf0af7
cmake: sync warnings with autotools v2
By some reason gcc reports next error:
  ../http.c:3330:11: warning: assignment discards ‘const’ qualifier from pointer target type [-Wdiscarded-qualifiers]
       value = "";

Only under -Wwrite-strings, well this is logical, but this information
does not reflected in any documentation.

Follow-up: 8348b413 ("cmake: add various warning flags like autotools has")

f

(cherry picked from commit 42d5a36bd8076c137545759d34500401627a649b)
2019-05-25 21:25:10 +03:00
John Ohl
3f893f0a6e
Add support for EV_TIMEOUT to event_base_active_by_fd
Closes: #194 (cherry-pick)
(cherry picked from commit 62df1301ca943011fa9c398323049bcddca2694d)
2019-05-25 21:25:10 +03:00
Azat Khuzhin
61fa7b7d80
buffer: make evbuffer_prepend() of zero-length array no-op
Refs: #774
(cherry picked from commit c4fbae3ae6166dddfa126734edd63213afa14dce)
2019-05-25 21:25:10 +03:00
Azat Khuzhin
6a3dd717bc
Merge branch 'evbuffer-empty-chain-handling'
* evbuffer-empty-chain-handling:
  buffer: do not rely on ->off in advance_last_with_data()
  buffer: fix evbuffer_remove_buffer() with empty chain in front
  test: verify content of the buffer in evbuffer/remove_buffer_with_empty*

(cherry picked from commit b69524c004fb68bcd9475e7aa61f5a7cdb45d304)
2019-05-25 21:25:10 +03:00
Seong-Joong Kim
6602a97d7d
Remove needless check for arc4_seeded_ok
(cherry picked from commit 16a151df5c59c0539d06465172742cc50751ea77)
2019-05-25 21:25:09 +03:00
Enji Cooper
5e39750de8
Fix typos: warnigns -> warnings
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
(cherry picked from commit 91dad75f7d04c2bef05bdd1dca7c29340ce33900)
2019-05-25 21:25:09 +03:00
Enji Cooper
c5cf4a5cb5
Fix typos in a comment describing the purpose of VersionViaGit.cmake
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
(cherry picked from commit 0b468bb07e3476d06907ca6c8e5c24bbb05e31a4)
2019-05-25 21:25:09 +03:00
Enji Cooper
00ba9fa299
Define _GNU_SOURCE properly/consistently per autoconf
Although `_GNU_SOURCE` can be defined as an arbitrary #define per the
glibc docs [1], it's best to define it in a manner consistent with the way
that autoconf defines it, i.e., `1`.

While this shouldn't matter in most cases, it does when the headers from
other projects follow the poorly defined GNU convention implemented by
autoconf and are included after the libevent's util.h header. An example
failure with clang, similar to the failure I encountered, is as follows:
```
$ printf "#define _GNU_SOURCE\n#define _GNU_SOURCE 1" | clang -c -x c -
<stdin>:2:9: warning: '_GNU_SOURCE' macro redefined [-Wmacro-redefined]
        ^
<stdin>:1:9: note: previous definition is here
        ^
1 warning generated.
```

This happened when compiling python [2] with a stale homebrew util.h file from
libevent (which admittedly would not happen in a correct libevent install, as the
header should be installed under /usr/local/include/event2/util.h). However, if
both headers had been combined (which is more likely), it would have failed as
shown above.

Removing the ad hoc definition unbreaks compiling python's pyconfig.h.in header
when included after util.h from libevent.

1. http://www.gnu.org/software/libc/manual/html_node/Feature-Test-Macros.html
2. https://github.com/python/cpython/blob/master/configure.ac#L126

Closes: #773 (cherry-picked)

Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
(cherry picked from commit 5f87be42f0ae0126938624a1419a572607078217)
2019-05-25 21:25:09 +03:00
Yury Korzhetsky
3d1a7a1d45
Don't loose top error in SSL
Closes: #775 (cherry-picked)
(cherry picked from commit a30d6d85219ea80c16df6da4f6a9430254e5a0da)
2019-05-25 21:25:09 +03:00
Azat Khuzhin
ca76ebb0d6
Ignore bitrise branches for travis-ci/appvyeor [ci skip]
(cherry picked from commit b34192bae6f511b91a2fc01409676b2df2fd8a31)
2019-05-25 21:25:09 +03:00
Azat Khuzhin
5991f5b22c
Update link to the appveyor project
Since the migration request has been hanged for a while, let's switch it
for now without beauty API URL.

Fixes: #555
(cherry picked from commit 2fccb967c52e9f5373494df2773c684dee5ef973)
2019-05-25 21:25:09 +03:00
Azat Khuzhin
5362f74995
Match definition with prototype for bufferevent_socket_set_conn_address_fd_()
Fixes: #772
Fixes: b29207dc ("Eliminate fd conversion warnings and introduce EVUTIL_INVALID_SOCKET (windows)")
(cherry picked from commit 5722e13b871063f13912a6ccafe4c94e1b3b41c5)
2019-05-25 21:25:08 +03:00
Azat Khuzhin
a45f6733bd
Revert "test: avoid regress hanging in macOS"
After we started to use kill() over raise() everything should work just
fine.

This reverts commit a86f89d333d870e6714bd28c695ba1774df3d7f5.

Fixed-in: 728c5dc1 ("Use kill() over raise() for raising the signal (fixes osx 10.14 with kqueue)")
Fixes: #747
(cherry picked from commit 14eb903ba31987d24357abd05923677d194fedae)
2019-05-25 21:25:08 +03:00
Azat Khuzhin
3db5296bb1
Use kill() over raise() for raising the signal (fixes osx 10.14 with kqueue)
On OSX 10.14+ the raise() uses pthread_kill() (verified with dtruss) and
by some reason signals that has been raised with pthread_kill() do not
received by kqueue EVFILT_SIGNAL.

While on OSX 10.11 the raise()/pthread_kill() uses plain kill() and
everything work just fine (linux also does the same, but instead of
kill() it uses tgkill())

Here is a simple reproducer that installs alarm to show that the signal
does not received by the kqueue backend:
  https://gist.github.com/azat/73638b8e3b0fa563a20dadcca9e652a1

Refs: #747
Fixes: #765
(cherry picked from commit 728c5dc11f55b4ba5f518812833eab5a2cc3d550)
2019-05-25 21:25:08 +03:00
Nathan French
9108414032
Merge pull request #769 from sungjungk/fix-return-handling
Add error-handling routine for arc4_seed()

(cherry picked from commit 8d5b14d42888416404a24f8060b514f8258b7f17)
2019-05-25 21:25:08 +03:00
Nathan French
fcdda24b3a
Added DNS header mask definitions.
Currently, we do a lot of data munging with manual hex. This is ugly
and can lead to bugs. I defined the following:

_QR_MASK    0x8000U
_OP_MASK    0x7800U
_AA_MASK    0x0400U
_TC_MASK    0x0200U
_RD_MASK    0x0100U
_RA_MASK    0x0080U
_Z_MASK     0x0040U
_AD_MASK    0x0020U
_CD_MASK    0x0010U
_RCODE_MASK 0x000fU

So that we can more easily twiddle flags.

v2: make evdns flag masks unsigned literal
Closes: #756 (cherry-picked)
(cherry picked from commit fb134939160a4baad89fd4ab20c49afd617057e3)
2019-05-25 21:25:08 +03:00
Azat Khuzhin
d44eb473cd
Merge 'official/pr/761' into patches-2.1 -- changelog fixes
* official/pr/761:
  changelog: fix extraneous "g" suffix on commit hashes in 2.1.9
  changelog: fix evrpc typo "evprc" in 2.1.9
2019-02-11 00:32:54 +03:00
Pierce Lopez
bf0cf6ec21 changelog: fix extraneous "g" suffix on commit hashes in 2.1.9 2019-02-10 16:12:11 -05:00
Pierce Lopez
8b6f67a467 changelog: fix evrpc typo "evprc" in 2.1.9 2019-02-10 16:09:15 -05:00
Azat Khuzhin
9c75c24caa
Merge branch 'release-2.1.9-beta-pull' into patches-2.1
* release-2.1.9-beta-pull:
  Bump version to 2.1.9-beta everywhere
  Bump ChangeLog
  Bump AUTHORS section
  ...

Tested on (cmake/autotools):
- ubuntu
- freebsd
- osx
- windows
- netbsd
- solaris
- centos

Closes: #744
2019-02-10 16:23:58 +03:00
Azat Khuzhin
900f5c4503
Bump version to 2.1.9-beta everywhere 2019-02-10 16:22:56 +03:00
Azat Khuzhin
b5126dbe0c
Bump ChangeLog 2019-02-10 16:22:56 +03:00
Azat Khuzhin
9e0a1e06cd
Bump AUTHORS section 2019-02-10 16:22:56 +03:00
Azat Khuzhin
e0e5d53b21
test/dns: in solaris under EMFILE devpoll does not dispatch
(cherry picked from commit 3ce38f6d2d74edcacfe17d612c611ae35e97acfc)
2019-02-10 14:34:08 +03:00
Azat Khuzhin
7f16190227
cmake: fix checking of devpoll backend (like in autotools, by devpoll.h existence)
(cherry picked from commit 8e87de3c24cad940516f49aa0466cfe53fa042bf)
2019-02-10 14:33:57 +03:00
Azat Khuzhin
5a26e7bd07
test/dns: in solaris under EMFILE the error is EAI_FAIL
(cherry picked from commit d234902da713cb722596f6bf66bb0dde8a3842dc)
2019-02-03 18:58:41 +03:00
Azat Khuzhin
ce4e2b7b8c
test/ssl/bufferevent_wm: explicitly break the loop once client/server received enough
There can be tricky cases (that can be reproduced by reducing
SO_RCVBUF/SO_SNDBUF to 6144, on linux, and be aware, since linux doubles
this const), when there is still write event pending, although we read
enough.

This should be fixed in a more sophisticated way, but to backport the
patch, let's simply break the loop manually.

The ssl/bufferevent_wm originally failed on solaris.

(cherry picked from commit ae9b285d2d7c9b898049072c157d50769d8014ea)
2019-02-03 18:58:41 +03:00
Azat Khuzhin
e66078a043
Eliminate fd conversion warnings and introduce EVUTIL_INVALID_SOCKET (windows)
windows has intptr_t instead of regular int.

Also tt_fd_op() had been introduced, since we cannot use tt_int_op() for
comparing fd, since it is not always int.

(cherry picked from commit b29207dceee33832bb28ab103a833df6a2fd29d3)
2019-02-02 15:18:08 +03:00
Azat Khuzhin
048bee0a12
evmap: use approparite type for changes to avoid warnings under windows
(cherry picked from commit 74c10894117f9dd2b230ec8d0e30d41c08df3b45)
2019-02-02 15:18:08 +03:00
Azat Khuzhin
283da04721
test/et/et: use evutil_socket_t* over int* for pointer to the pair
Next code will not work correctly under win x64:
  evutil_socket_t very_long_pair_name[2];
  int *pair = very_long_pair_name; // <-- accessing the second word of the first element

Because sizeof(evutil_socket_t) == sizeof(intptr_t) == 8

P.S. in the 5334762f another test had been fixed instead of the one that
really fails.

Fixes: 5334762f ("test/et/et: fix it by using appropriate type for the SOCKET (evutil_socket_t)")
Refs: #750
(cherry picked from commit 0791a17204ff70bbea92520352a0c6e8d185fa4b)
2019-02-02 15:18:07 +03:00
Azat Khuzhin
fa193d128f
appveyor: disable verbosity of MSBuild
(cherry picked from commit e2e82241d182807b154dad5c546d9ef4581eb489)
2019-02-02 15:18:07 +03:00
Azat Khuzhin
aee0fcd57c
Merge branch 'win64-fixes'
* win64-fixes:
  test/et/et: fix it by using appropriate type for the SOCKET (evutil_socket_t)
  test/et/et: verify return codes
  appveyor: switch to new VS/MinGW and x64

(cherry picked from commit 97a3e7f5802ce1baa3c959905e312cab2bebf4bf)
2019-02-02 15:18:07 +03:00