4052 Commits

Author SHA1 Message Date
Azat Khuzhin
7fd7c5eff3
Fix detection of the __has_attribute() for apple clang [ci skip]
Fixes build on the next osx env:
- Mac OS 10.9/clang 600
- Mac OS 10.8/clang 500

Refs: https://github.com/libevent/libevent/issues/447#issuecomment-497908488
(cherry picked from commit 7d569b0fafe76e9036695ccc9d22d2195c214bce)
2019-08-02 00:05:49 +03:00
wenyg
a8a04565b1
https-client: correction error checking
When connecting to a non-existent HTTPS service, the "req" is not null
but the "evhttp_request_get_response_code(req)" is zero.

Closes: #822 (cherry-picked)
(cherry picked from commit 891dd1880fed8c5e1e98f122daeb1ae8414f6b1c)
2019-08-02 00:05:49 +03:00
yuangongji
483f8a2970
typo error in header file
(cherry picked from commit c03dabd76aced01a9c8d253381c2ed6f3ad46b4f)
2019-08-02 00:05:48 +03:00
Tobias Stoeckmann
8c89976823
Protect min_heap_push_ against integer overflow.
On 64 bit systems with a lot of memory it is possible to overflow the
counter s->n (unsigned int) which keeps track of the amount of elements
within the heap.

On 32 bit systems with tightly packed memory layout (and adding the
same pointer again and again) an integer overflow could occur if "a"
reaches 2^30 because the multiplication with sizeof *p (4) would
overflow, effectively freeing memory of s->p which eventually leads to
a double free.

No sign of issue for any sane setup and therefore a purely defensive
measurement.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Refs: #799 (first version of the patch for backporting to 2.1.x only)
See-also: 181049739478d57500bd564539f17407437bfe8f ("Revert "Protect min_heap_push_ against integer overflow."")

(cherry picked from commit stoeckmann/libevent@47d348a631)
2019-07-31 11:26:05 +03:00
Azat Khuzhin
1810497394
Revert "Protect min_heap_push_ against integer overflow."
This patch breaks the ABI compatibility, due to min_heap_idx expansion
[1]

And since major distros did not updated to 2.1.10 yet, this patch will
be reverted:
- debian:     https://packages.debian.org/search?keywords=libevent-dev
- ubuntu:     https://packages.ubuntu.com/search?keywords=libevent-dev
- fedora:     https://apps.fedoraproject.org/packages/libevent-devel

Also there is one that upgraded already:
- archlinux:  https://www.archlinux.org/packages/?q=libevent
But archlinux is for developers, so it should be fine I guess.

  [1]: https://abi-laboratory.pro/index.php?view=objects_report&l=libevent&v1=2.1.9&v2=2.1.10

    - struct event_base
      Change: Size of this type has been changed from 672 bytes to 664 bytes.
      Effect: The fields or parameters of such data type may be incorrectly initialized or accessed by old client applications.

abi-compliance-checker diff with 2.1.9 before this patch:
  Binary compatibility: 69.2%
  Source compatibility: 100%
  Total binary compatibility problems: 1, warnings: 1
  Total source compatibility problems: 0, warnings: 0

after:
  Binary compatibility: 100%
  Source compatibility: 100%
  Total binary compatibility problems: 0, warnings: 0
  Total source compatibility problems: 0, warnings: 0

This reverts commit 0b46bb8cc9c0337b5fa0186d9cb031ff4f4ceb9a
2019-07-31 11:25:47 +03:00
Azat Khuzhin
047cd8a93f
Fix git command for the changes since 2.1.9-beta (copy-paste issue) 2019-05-26 00:27:56 +03:00
Azat Khuzhin
64a25bcdf5
Merge branch 'release-2.1.10-stable-pull' into patches-2.1
* release-2.1.10-stable-pull:
  Bump version to 2.1.10-stable everywhere
  Bump ChangeLog
  Bump AUTHORS section
  ...

Tested on (cmake/autotools):
- ubuntu
- freebsd
- osx
- windows
- netbsd
- solaris
- centos
release-2.1.10-stable
2019-05-26 00:14:14 +03:00
Azat Khuzhin
f5bfd721d1
Bump version to 2.1.10-stable everywhere 2019-05-25 23:45:37 +03:00
Azat Khuzhin
1972c52d3a
Bump ChangeLog 2019-05-25 23:45:37 +03:00
Azat Khuzhin
8a24ff20f0
Bump AUTHORS section 2019-05-25 23:44:43 +03:00
Azat Khuzhin
e2790a7f47
http: do not name variable "sun" since this breaks solaris builds
-bash-3.2$ /opt/csw/bin/gcc -xc /dev/null -dM -E | grep '#define sun'
  #define sun 1

(cherry picked from commit 1c573ab3a9037c560981ea325170ca6044c2dff6)
2019-05-25 23:44:43 +03:00
Azat Khuzhin
3da21a9491
cmake: add -Wmissing-prototypes (like autotools has)
(cherry picked from commit 49a367e6cfb9b9bc8d1b04cbfb834ec3e0c1d84d)
2019-05-25 21:25:33 +03:00
Azat Khuzhin
faa4e3735a
time-test: disable buffering (mostly for windows)
(cherry picked from commit 4c774b6ceb94d7c40c459e39c82ae7eb782823f8)
2019-05-25 21:25:33 +03:00
Azat Khuzhin
2fea04b30e
Merge branch 'evbuffer-fixes-806-v2'
* evbuffer-fixes-806-v2:
  evbuffer: fix last_with_datap after prepend with empty chain
  test: regression for evbuffer_expand_fast_() with invalid last_with_datap
  test: cover adjusting of last_with_datap in evbuffer_prepend()

Fixes: #806
(cherry picked from commit 3b1864b625ec37c3051512845982f347f4cc5621)
2019-05-25 21:25:33 +03:00
Azat Khuzhin
7042ff2463
Add getopt into dist archive
Fixes: #815
(cherry picked from commit c8b403a81bda3a9603ffda9c393a823719fda196)
2019-05-25 21:25:29 +03:00
Azat Khuzhin
7c4da93715
Merge branch 'issue-807-accept4-getnameinfo-AF_UNIX'
* issue-807-accept4-getnameinfo-AF_UNIX:
  http-server: add usage/help dialog
  http: avoid use of uninitialized value for AF_UNIX/AF_LOCAL sockaddr
  http-server: add ability to bind to unix-socket
  build: struct sockaddr_un detection (sys/un.h, afunix.h)

Fixes: #807
(cherry picked from commit 76eded24d3b0c3fc48c5a888906cc9043223101b)
2019-05-25 21:25:13 +03:00
Tobias Stoeckmann
e70e18e942
kqueue: Avoid undefined behaviour.
As ploxiln pointed out in pull request 811 the check "newsize < 0"
is undefined behaviour (signed int overflow).

Follow the advice and check kqop->changes_size instead.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
Closes: #813 (cherry-picked)
(cherry picked from commit 2707a4ffabe539999f37a0364f7b0ef44a90589a)
2019-05-25 21:25:13 +03:00
Tobias Stoeckmann
43a55a2380
Prevent integer overflow in kq_build_changes_list.
On amd64 systems with kqueue (e.g. *BSD systems) an integer overflow
could be triggered with an excessively huge amount of events.

Signed-off-by: Tobias Stoeckmann <tobias@stoeckmann.org>
(cherry picked from commit cf8acae36a580935c42228f3d30f3e96c8a3ef59)
2019-05-25 21:25:13 +03:00
zhuizhuhaomeng
5410388342
evdns: fix lock/unlock mismatch in evdns_close_server_port()
Closes: #809 (cherry-picked)
(cherry picked from commit 8701d0d3d2519800f46ab031a0b0d887b6eb1359)
2019-05-25 21:25:13 +03:00
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