|
4c908dde
|
2019-08-02T00:37:51
|
|
Merge branch 'release-2.1.11-stable-pull' into patches-2.1
* release-2.1.11-stable-pull:
Bump version to 2.1.11-stable (with ABI breakage)
Bump ChangeLog
Bump AUTHORS.md
...
|
|
5b723a66
|
2019-08-02T00:23:11
|
|
Bump version to 2.1.11-stable (with ABI breakage)
|
|
70026169
|
2019-08-02T00:20:30
|
|
Bump ChangeLog
|
|
b9c364e4
|
2019-08-02T00:12:11
|
|
Bump AUTHORS.md
|
|
9559349c
|
2019-07-03T00:27:22
|
|
Missing <winerror.h> on win7/MinGW(MINGW32_NT-6.1)/MSYS
(cherry picked from commit 7806f3ec78368d69bfcf53cdffcdb424a528a113)
|
|
305251b9
|
2019-07-10T00:30:12
|
|
cmake: set library names to be the same as with autotools
libtool has VERSION_INFO [1], cmake has SOVERSION/VERSION instead
(although it has different format). Also libtool has RELEASE [2] while
cmake do not have analog yet [3], hence manual symlinks should be
created.
[1]: https://www.gnu.org/software/libtool/manual/html_node/Libtool-versioning.html
[2]: https://www.gnu.org/software/libtool/manual/html_node/Release-numbers.html
[3]: https://gitlab.kitware.com/cmake/cmake/issues/17652
Plus osx has compatibility_version/current_version dylib properties and
cmake do not have separate properties for them [4], hence manual LINK_FLAGS.
And also there INSTALL_NAME_DIR property which should be adjusted too.
[4]: https://public.kitware.com/Bug/view.php?id=4383
So after all changes, here is an example before/after for osx and linux:
# osx
# autotools
.libs/libevent_pthreads-2.2.1.dylib
.libs/libevent_pthreads.dylib -> libevent_pthreads-2.2.1.dylib
/usr/local/lib/libevent_pthreads-2.2.1.dylib (compatibility version 2.0.0, current version 2.0.0)
# cmake
# before patch
lib/libevent_pthreads.2.2.0.dylib
lib/libevent_pthreads.dylib -> libevent_pthreads.2.2.0.dylib
@rpath/libevent_pthreads.2.2.0.dylib (compatibility version 2.2.0, current version 0.0.0)
# after patch
lib/libevent_pthreads-2.2.1.dylib
lib/libevent_pthreads.dylib -> libevent_pthreads-2.2.1.dylib
/vagrant/.cmake/inst/lib/libevent_pthreads-2.2.1.dylib (compatibility version 2.0.0, current version 2.0.0)
# linux
# autotools
.libs/libevent_pthreads-2.2.so.1 -> libevent_pthreads-2.2.so.1.0.0
.libs/libevent_pthreads-2.2.so.1.0.0
.libs/libevent_pthreads.so -> libevent_pthreads-2.2.so.1.0.0
# cmake
# before patch
lib/libevent_pthreads.so -> libevent_pthreads.so.2.2.0
lib/libevent_pthreads.so.2.2.0
# after patch
lib/libevent_pthreads-2.2.so -> libevent_pthreads-2.2.so.1
lib/libevent_pthreads-2.2.so.1 -> libevent_pthreads-2.2.so.1.0.0
lib/libevent_pthreads-2.2.so.1.0.0
lib/libevent_pthreads.so -> libevent_pthreads-2.2.so.1.0.0
Closes: #838 (cherry-picked)
Closes: #760
(cherry picked from commit 669a53f341e192657140952cfe025c260da2b1c1)
|
|
598f247d
|
2019-07-31T10:34:38
|
|
buffer: fix possible NULL dereference in evbuffer_setcb() on ENOMEM
[ @azat:
- add return heredoc for evbuffer_setcb()
- add unit test with event_set_mem_functions()
- look through the report from abi-compliance-checker/abi-dumper
]
Closes: #855
(cherry picked from commit bdcade47224f154052c927aed3c363a18b37112e)
|
|
f013fc7d
|
2019-07-08T14:06:55
|
|
Enable _GNU_SOURCE for Android
When targeting the Android NDK _GNU_SOURCE is not enabled by default:
```
/*
* With bionic, you always get all C and POSIX API.
*
* If you want BSD and/or GNU extensions, _BSD_SOURCE and/or _GNU_SOURCE are
* expected to be defined by callers before *any* standard header file is
* included.
*
* In our header files we test against __USE_BSD and __USE_GNU.
*/
#if defined(_GNU_SOURCE)
# define __USE_BSD 1
# define __USE_GNU 1
#endif
```
Because of this `pipe2` is not available:
```
#if defined(__USE_GNU)
int pipe2(int __fds[2], int __flags) __INTRODUCED_IN(9);
#endif
```
The function used to check if it does exist:
```
CHECK_FUNCTION_EXISTS_EX(pipe2 EVENT__HAVE_PIPE2)
```
Just check that the _linking_ succeeds, which it does, it's just not
visible in the import, leading to a warning (or error):
```
evutil.c:2637:6: error: implicit declaration of function 'pipe2' is invalid in C99 [-Werror,-Wimplicit-function-declaration]
if (pipe2(fd, O_NONBLOCK|O_CLOEXEC) == 0)
^
```
When targeting the NDK it should be safe to always opt into this. Clang
would pass the right flag for us automatically _if_ the source was C++
instead of C.
(cherry picked from commit 41c95abb9930b0c13c238e110b857acb810ad7b9)
|
|
3aa68a82
|
2019-07-02T10:47:47
|
|
Enable kqueue for APPLE targets
The CMAKE_CROSSCOMPILING variable is not set for Apple targets seemingly
because of cmake implementation details (more info
https://cmake.org/cmake/help/latest/variable/CMAKE_CROSSCOMPILING.html).
Since Apple targets have working kqueue implementations this check makes
sure we enable it always when those are the targets, without users
having to explicitly set EVENT__HAVE_WORKING_KQUEUE
(cherry picked from commit 0d7d85c2083f7a4c9efe01c061486f332b576d28)
|
|
2a333008
|
2019-07-27T22:41:39
|
|
Change autoconf version to 2.62 and automake version to 1.11.2
On my computer, the version of autoconf is 2.59 and automake is 1.9
I build with autogen.sh & configure & make and failed.
I find In Makefile.am:
include/event2/event-config.h: config.h make-event-config.sed
$(AM_V_GEN)test -d include/event2 || $(MKDIR_P) include/event2
$(AM_V_at)$(SED) -f $(srcdir)/make-event-config.sed < config.h > $@T
$(AM_V_at)mv -f $@T $@
There are three undefined variables: MKDIR_P, AM_V_GEN and AM_V_at.
Then I tried:
- autoconf-2.60 / automake-1.10
- autoconf-2.61 / automake-1.11
- autoconf-2.62 / automake-1.11.2
And only autoconf-2.62 & automake-1.11.2 is ok.
Therefore, I recommend changing the autoconf version from 2.59 to 2.62
and automake version from 1.9 to 1.11.2.
Plus autoconf 2.59 is too old - 2003.12.16 [1], so as automake 1.9 -
2004.08.11 [2], while $(AM_V_GEN)/$(AM_V_at) had been introduced in
371a1237 back in 2012.
[1]: http://ftp.gnu.org/gnu/autoconf/
[1]: http://ftp.gnu.org/gnu/automake/
Fixes: 371a1237 ("Make quiet build even quieter")
(cherry picked from commit 1947dd0ddbced0d8f9891656c820353f82261c52)
|
|
b75922ae
|
2019-07-01T23:54:02
|
|
Warn if forked from the event loop during event_reinit()
Calling fork() from the event loop is not a great idea, since at least
it shares some internal pipes (for handling signals) before
event_reinit() call
Closes: #833
(cherry picked from commit 497ef904d544ac51de43934549dbeccce8e6e8f8)
|
|
5349a07e
|
2019-06-26T09:36:49
|
|
autotools: do not install bufferevent_ssl.h under --disable-openssl
Refs: https://github.com/libevent/libevent/issues/760#issuecomment-502345788
(cherry picked from commit 5388a002f5ad3bdfc756584dc58485fc3db135d0)
|
|
596855f7
|
2019-07-12T00:00:12
|
|
cmake: install shared library only if it was requested
$ cmake -DEVENT__LIBRARY_TYPE=static ..
...
CMake Error:
Error evaluating generator expression:
$<TARGET_FILE_DIR:event_core_shared>
No target "event_core_shared"
Fixes: #853
Fixes: 669a53f3 ("cmake: set library names to be the same as with autotools")
(cherry picked from commit 55d1e20e1a5dbd1188f4143968f7cafee33edc0d)
|
|
c9ce638c
|
2019-06-26T01:27:20
|
|
cmake: link against shell32.lib/advapi32.lib
Fixes: #844
Refs: #760 (cmake-vs-autotools)
(cherry picked from commit 69466cde0382ab3df12e3a011720f87af3998081)
|
|
3660a4cc
|
2019-06-26T01:20:53
|
|
Add README.md into dist archive
Fixes: #841
(cherry picked from commit 97488b2c28473b6be339e4c2325372d2425fe0aa,
only the README.md part)
|
|
546a366c
|
2019-06-15T23:18:05
|
|
evdns: add new options -- so-rcvbuf/so-sndbuf
This will allow to customize SO_RCVBUF/SO_SNDBUF for nameservers in this
evdns_base, you may want to adjust them if the kernel starts dropping
udp packages.
(cherry picked from commit 538141eb7e590bc94c043b43b5e5483b13bc9c5e)
|
|
a09265ac
|
2019-06-15T00:16:00
|
|
evutil: drop force_check from evutil_check_interfaces() (unused)
(cherry picked from commit 4f6fc092b3ee0b996b50df3c0d22b356f0a9236c)
|
|
ef498aa2
|
2019-06-14T10:19:51
|
|
evutil: set the have_checked_interfaces in evutil_check_interfaces()
Closes: #836 (cherry-picked)
Fixes: #834
(cherry picked from commit 0de2b1455b348466e8e29704ba8760127cd63528)
|
|
2d65071c
|
2019-06-09T20:15:37
|
|
cmake: add missing autotools targets (doxygen, uninstall, event_rpcgen.py)
Close: #832 (cherry-picked)
(cherry picked from commit 7201062f3ef505a77baa6ccaf1cf73812462308a)
|
|
d4056e59
|
2019-06-08T23:44:37
|
|
m4/libevent_openssl.m4: fix detection of openssl
Since commit 506df426dbeb0187bbd3654bd286b4100628fb16, OPENSSL_INCS is
added to CPPFLAGS without any white space, as a result openssl detection
fails on:
configure:10395: checking openssl/ssl.h usability
configure:10395: /home/fabrice/buildroot-test/buildroot/output/host/bin/riscv32-linux-gcc -c -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -Os -Wall -fno-strict-aliasing -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64-I/home/fabrice/buildroot-test/buildroot/output/host/bin/../riscv32-buildroot-linux-gnu/sysroot/usr/include conftest.c >&5
<command-line>:0:0: warning: "_FILE_OFFSET_BITS" redefined
<command-line>:0:0: note: this is the location of the previous definition
<command-line>:0:23: error: division by zero in #if
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
(cherry picked from commit 0374b55942e533a3c3997439481a8d05d6c8f729)
|
|
7fd7c5ef
|
2019-06-02T20:20:02
|
|
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)
|
|
a8a04565
|
2019-05-30T17:38:49
|
|
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)
|
|
483f8a29
|
2019-05-31T02:12:55
|
|
typo error in header file
(cherry picked from commit c03dabd76aced01a9c8d253381c2ed6f3ad46b4f)
|
|
8c899768
|
2019-04-16T21:12:21
|
|
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@47d348a63130c91f2a6aadef291ff5687275df72)
|
|
18104973
|
2019-07-31T11:25:47
|
|
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
|
|
047cd8a9
|
2019-05-26T00:27:56
|
|
Fix git command for the changes since 2.1.9-beta (copy-paste issue)
|
|
64a25bcd
|
2019-05-26T00:14:14
|
|
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
|
|
f5bfd721
|
2019-05-25T22:33:45
|
|
Bump version to 2.1.10-stable everywhere
|
|
1972c52d
|
2019-05-25T21:57:37
|
|
Bump ChangeLog
|
|
8a24ff20
|
2019-05-25T21:50:55
|
|
Bump AUTHORS section
|
|
e2790a7f
|
2019-05-25T23:41:38
|
|
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)
|
|
3da21a94
|
2019-05-25T17:28:53
|
|
cmake: add -Wmissing-prototypes (like autotools has)
(cherry picked from commit 49a367e6cfb9b9bc8d1b04cbfb834ec3e0c1d84d)
|
|
faa4e373
|
2019-05-21T10:59:05
|
|
time-test: disable buffering (mostly for windows)
(cherry picked from commit 4c774b6ceb94d7c40c459e39c82ae7eb782823f8)
|
|
2fea04b3
|
2019-05-16T10:25:50
|
|
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)
|
|
7042ff24
|
2019-05-15T21:29:03
|
|
Add getopt into dist archive
Fixes: #815
(cherry picked from commit c8b403a81bda3a9603ffda9c393a823719fda196)
|
|
7c4da937
|
2019-05-12T19:06:43
|
|
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)
|
|
e70e18e9
|
2019-05-10T23:54:14
|
|
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)
|
|
43a55a23
|
2019-05-07T20:53:17
|
|
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)
|
|
54103883
|
2019-05-06T11:37:02
|
|
evdns: fix lock/unlock mismatch in evdns_close_server_port()
Closes: #809 (cherry-picked)
(cherry picked from commit 8701d0d3d2519800f46ab031a0b0d887b6eb1359)
|
|
87fa93a8
|
2019-04-30T08:43:27
|
|
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)
|
|
0b46bb8c
|
2019-04-16T21:12:21
|
|
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)
|
|
2a1e1530
|
2019-04-18T17:10:33
|
|
le-proxy: initiate use of the Winsock DLL
Closes: #803 (cherry-picked)
(cherry picked from commit 16d8564a2cd2ec665b577f39eea6583d4b651e92)
|
|
d83a517c
|
2019-04-04T09:09:09
|
|
Remove experimental note for finalizers API
(cherry picked from commit 55f9863b18fe21ddd220d98941b7ac777593dde5)
|
|
c0adad8f
|
2019-04-03T23:22:54
|
|
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)
|
|
51853472
|
2019-04-03T23:20:06
|
|
http: drop unused internal macros
(cherry picked from commit 35caeff5deacd5e081a4e6220b9226b61e24208d)
|
|
89932001
|
2019-04-03T07:26:21
|
|
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)
|
|
17eee0e4
|
2019-04-02T23:25:08
|
|
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)
|
|
c010069b
|
2019-04-01T02:42:55
|
|
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)
|
|
58e81106
|
2019-04-01T01:47:00
|
|
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)
|
|
aa5a65d1
|
2019-04-01T01:40:18
|
|
evdns: add descriptions for DNS_OPTION_*/DNS_OPTIONS_ALL
(cherry picked from commit 3e0dc1a6ab4b7024b93dc44c1bb79df0ef637fc0)
|
|
22380996
|
2019-03-25T01:40:46
|
|
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)
|
|
d89045a6
|
2019-03-25T01:41:09
|
|
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)
|
|
75d7e1ff
|
2019-03-24T20:36:16
|
|
tinytest: fix parsing --timeout argument
Fixes: 15b2f41d ("tinytest: implement per-test timeout (via alarm() under !win32 only)")
(cherry picked from commit 8a674243b444da9e0742ac837334aaf38e6a703a)
|
|
b64dbfb6
|
2019-03-24T16:44:56
|
|
tinytest: implement per-test timeout (via alarm() under !win32 only)
(cherry picked from commit 15b2f41d748643393b9f95b790d32e6bbbf38062)
|
|
bb0f8fe7
|
2019-03-16T17:28:31
|
|
Fix leaks in error path of the bufferevent_init_common_()
(cherry picked from commit 6995b9a864c16bcb84ea0f7a2cf856143020316b)
|
|
b6724b60
|
2019-03-16T16:52:05
|
|
bench: suppress int conversion warnings
(cherry picked from commit efcc18442b338d931f6dfe71d5ebaff3c6fa2b03)
|
|
7c669cc7
|
2019-03-16T16:37:38
|
|
Suppress int conversion warnings in getopt_long compatibility
(cherry picked from commit 61e4a651d7054d41c8669c2a5340679b64f6ecf6)
|
|
b062bf0a
|
2019-03-13T00:02:39
|
|
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)
|
|
3f893f0a
|
2014-12-09T21:43:18
|
|
Add support for EV_TIMEOUT to event_base_active_by_fd
Closes: #194 (cherry-pick)
(cherry picked from commit 62df1301ca943011fa9c398323049bcddca2694d)
|
|
61fa7b7d
|
2019-03-03T19:03:29
|
|
buffer: make evbuffer_prepend() of zero-length array no-op
Refs: #774
(cherry picked from commit c4fbae3ae6166dddfa126734edd63213afa14dce)
|
|
6a3dd717
|
2019-03-03T18:58:57
|
|
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)
|
|
c5cf4a5c
|
2019-02-28T17:22:30
|
|
Fix typos in a comment describing the purpose of `VersionViaGit.cmake`
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
(cherry picked from commit 0b468bb07e3476d06907ca6c8e5c24bbb05e31a4)
|
|
00ba9fa2
|
2019-02-25T11:59:15
|
|
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)
|
|
3d1a7a1d
|
2019-02-26T12:33:49
|
|
Don't loose top error in SSL
Closes: #775 (cherry-picked)
(cherry picked from commit a30d6d85219ea80c16df6da4f6a9430254e5a0da)
|
|
ca76ebb0
|
2019-02-25T00:26:39
|
|
Ignore bitrise branches for travis-ci/appvyeor [ci skip]
(cherry picked from commit b34192bae6f511b91a2fc01409676b2df2fd8a31)
|
|
5991f5b2
|
2019-02-24T22:59:33
|
|
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)
|
|
6602a97d
|
2019-02-21T16:19:10
|
|
Remove needless check for arc4_seeded_ok
(cherry picked from commit 16a151df5c59c0539d06465172742cc50751ea77)
|
|
5e39750d
|
2019-02-28T17:47:51
|
|
Fix typos: warnigns -> warnings
Signed-off-by: Enji Cooper <yaneurabeya@gmail.com>
(cherry picked from commit 91dad75f7d04c2bef05bdd1dca7c29340ce33900)
|
|
5362f749
|
2019-02-24T17:34:20
|
|
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)
|
|
a45f6733
|
2019-02-24T17:25:31
|
|
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)
|
|
3db5296b
|
2019-02-24T17:07:18
|
|
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)
|
|
91084140
|
2019-02-21T10:21:02
|
|
Merge pull request #769 from sungjungk/fix-return-handling
Add error-handling routine for arc4_seed()
(cherry picked from commit 8d5b14d42888416404a24f8060b514f8258b7f17)
|
|
fcdda24b
|
2019-02-07T11:43:14
|
|
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)
|
|
d44eb473
|
2019-02-11T00:32:54
|
|
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
|
|
bf0cf6ec
|
2019-02-10T16:12:11
|
|
changelog: fix extraneous "g" suffix on commit hashes in 2.1.9
|
|
8b6f67a4
|
2019-02-10T16:09:15
|
|
changelog: fix evrpc typo "evprc" in 2.1.9
|
|
9c75c24c
|
2019-02-10T16:23:11
|
|
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
|
|
900f5c45
|
2019-02-03T19:19:46
|
|
Bump version to 2.1.9-beta everywhere
|
|
b5126dbe
|
2019-02-03T19:25:09
|
|
Bump ChangeLog
|
|
9e0a1e06
|
2019-02-10T14:39:49
|
|
Bump AUTHORS section
|
|
e0e5d53b
|
2019-02-04T22:34:10
|
|
test/dns: in solaris under EMFILE devpoll does not dispatch
(cherry picked from commit 3ce38f6d2d74edcacfe17d612c611ae35e97acfc)
|
|
7f161902
|
2019-02-04T22:18:45
|
|
cmake: fix checking of devpoll backend (like in autotools, by devpoll.h existence)
(cherry picked from commit 8e87de3c24cad940516f49aa0466cfe53fa042bf)
|
|
5a26e7bd
|
2019-02-03T18:54:00
|
|
test/dns: in solaris under EMFILE the error is EAI_FAIL
(cherry picked from commit d234902da713cb722596f6bf66bb0dde8a3842dc)
|
|
ce4e2b7b
|
2019-02-03T18:47:14
|
|
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)
|
|
e66078a0
|
2019-01-29T21:12:33
|
|
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)
|
|
048bee0a
|
2019-01-29T21:31:19
|
|
evmap: use approparite type for changes to avoid warnings under windows
(cherry picked from commit 74c10894117f9dd2b230ec8d0e30d41c08df3b45)
|
|
283da047
|
2019-01-29T21:06:37
|
|
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)
|
|
fa193d12
|
2019-01-29T20:58:01
|
|
appveyor: disable verbosity of MSBuild
(cherry picked from commit e2e82241d182807b154dad5c546d9ef4581eb489)
|
|
aee0fcd5
|
2019-01-29T10:54:39
|
|
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)
|
|
1d9319c7
|
2019-01-29T07:56:21
|
|
win32select: print an error in case of failure
(cherry picked from commit 8882f4fd60aa61fe1caf8b372989427a9872c3b9)
|
|
3ebd7edd
|
2019-01-29T10:10:23
|
|
Add OS-specific exclude patterns of the branch names for the CI
(cherry picked from commit f88b8946f3da988f7aa80e36681037b4f474840e)
|
|
8eb00842
|
2019-01-29T01:23:02
|
|
s/http-server: fix cleanup routines
Fixes: bdd71f18 ("s/http-server: graceful cleanup")
(cherry picked from commit afdccee9b3648a76e119fb4d5f922191cd09d748)
|
|
eb7b472b
|
2019-01-29T01:18:39
|
|
Merge branch 'http-EVHTTP_CON_READ_ON_WRITE_ERROR-fixes-v2'
* http-EVHTTP_CON_READ_ON_WRITE_ERROR-fixes-v2:
http: try to read existing data in buffer under EVHTTP_CON_READ_ON_WRITE_ERROR
test: add logging for http/read_on_write_error and rearrange code
http: do not call deferred readcb if readcb is not set
Refs: #749
(cherry picked from commit 7bfe93886d7fccad2d9a6c76cf47c47d3668f9d1)
|
|
9f02b39c
|
2019-01-28T22:19:20
|
|
Merge branch 'travis-ci-osx-fixes'
* travis-ci-osx-fixes:
travis-ci/osx: switch to xcode 10.1, since 9.4 is not compatible with gcc-8
travis-ci/osx: install gcc and fix CC
(cherry picked from commit 5613bfb8dcd70ea1c89d04b550d9f97958cc48d2)
|
|
170debc7
|
2019-01-26T18:52:33
|
|
test: adjust expecting error for getaddrinfo() under EMFILE
When getaddrinfo() cannot allocate file descriptor glibc/musl-libc on
linux report EAI_SYSTEM error. But this is not true for freebsd libc [1]
(and hence apple libc [2]), they report EAI_NONAME error instead, so
adjust expectation.
[1]: https://github.com/freebsd/freebsd/blob/master/lib/libc/net/getaddrinfo.c
[2]: https://opensource.apple.com/source/Libc/
Refs: #749
Refs: https://github.com/libevent/libevent/issues/749#issuecomment-457838159
(cherry picked from commit 4ffc7116177230ad2b8b94d51bbf89a14dc83687)
|
|
982a7e88
|
2019-01-12T13:58:50
|
|
test/nonpersist_readd: use assert helpers
To debug failure under win32 in appveyor:
https://ci.appveyor.com/project/nmathewson/libevent/builds/21559140/job/dn16qdo1j6sr497t#L1620
(cherry picked from commit 91a2f1346e80c67526261ba81c8f3b3736107bcb)
|
|
a95cc9e3
|
2019-01-11T21:52:11
|
|
rpc: use *_new_with_arg() to match function prototype
In 755fbf16c ("Add void* arguments to request_new and reply_new
evrpc hooks") this new functions had been introduced, but newer used,
what for? So let's use them.
(cherry picked from commit 99b231b0d875bc0814b0e4a940b6c9890d2a7754)
|
|
2ccd00a6
|
2018-12-28T04:42:20
|
|
http: Preserve socket error from listen across closesocket cleanup
Closes: #738 (cherry-picked)
(cherry picked from commit 28d7221b851093611c65b5961e138403dd7332b6)
|
|
c8b3ec17
|
2018-12-17T21:31:54
|
|
cmake: support static runtime (MSVC)
Fixes: #737
(cherry picked from commit 246f44041e0782f728fa5ff2d39113005a1ab02d)
|
|
61fb055a
|
2018-12-17T21:41:32
|
|
appveyor: cover static libs for MSVC
(cherry picked from commit 51945fd9399d2392010456a6d2c49815bc8f938e)
|