|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
339f76c0
|
2018-12-15T21:45:36
|
|
fix a comment error
Closes: #736 (cherry-picked)
(cherry picked from commit 972da7c838b54c224889525a5cb9561f4024aff2)
|
|
c264028c
|
2018-12-15T12:54:31
|
|
cmake: Fix some typos in option descriptions
(cherry picked from commit f33c2ce5f89bc334230867f37d07dbfd5e3921bd)
|
|
d30e7bba
|
2018-12-07T21:46:27
|
|
http: fix connection retries when there more then one request for connection
We should not attemp to establishe the connection if there is retry
timer active, since otherwise there will be a bug.
Imagine next situation:
con = evhttp_connection_base_new()
evhttp_connection_set_retries(con, 2)
req = evhttp_request_new()
evhttp_make_request(con, req, ...)
# failed during connecting, and timer for 2 second scheduler (retry_ev)
Then another request scheduled for this evcon:
evhttp_make_request(con, req, ...)
# got request from server,
# and now it tries to read the response from the server
# (req.kind == EVHTTP_RESPONSE)
#
# but at this point retry_ev scheduled,
# and it schedules the connect again,
# and after the connect will succeeed, it will pick request with
# EVHTTP_RESPONSE for sending and this is completelly wrong and will
# fail in evhttp_make_header_response() since there is no
# "http_server" for this evcon
This was a long standing issue, that I came across few years ago
firstly, bad only now I had time to dig into it (but right now it was
pretty simple, by limiting amount of CPU for the process and using rr
for debug to go back and forth).
(cherry picked from commit f3f7aa5afff2c0be4a1a299a1a7d0a64558abc23)
|
|
a8155c62
|
2018-12-09T14:48:44
|
|
Do not check O_NONBLOCK for invalid fds
Fixes: 6f988ee1 ("Merge branch 'check-O_NONBLOCK-in-debug'")
(cherry picked from commit 9d3a415a99bbc6a7e0f0b12ae3c6c5c7e4613cf1)
|
|
f9c5d17b
|
2018-12-08T17:35:53
|
|
test-fdleak: fix memory leaks
Fixes: #726
(cherry picked from commit e5ec52d100ee94af14753513f4b4594e94eb02e1)
|
|
412be74a
|
2018-12-05T11:40:40
|
|
travis-ci: do not run coveralls with clang (SIGSEGV)
This will fix coveralls badge
See: https://travis-ci.org/libevent/libevent/jobs/458590276#L1425
(cherry picked from commit 3e6bec7c1aa416e3e6e85c7bda1bdc98b778d23c)
|
|
260db341
|
2018-12-05T11:46:30
|
|
Add mailmap
(cherry picked from commit 196e3a7b2bceaca5bee1914a92b9cfed41d8917d)
|
|
f9b592aa
|
2018-11-23T00:42:46
|
|
test: add TT_RETRIABLE for http/cancel_by_host_no_ns
Could fail from time to time in travis-ci:
https://travis-ci.org/libevent/libevent/jobs/458554097#L1702
Follow-up-for: fe5b0719 ("Mark a lot of flacky tests with TT_RETRIABLE (for linux/win32 only)")
(cherry picked from commit 1d2ef90032bc842bc2e295ee4adce3408b6d85da)
|
|
d156c608
|
2018-11-21T07:04:33
|
|
appveyor: enable parallel build
(cherry picked from commit 1a79fd38aa3bd34d941c4949ad3e4ba09aa8142b)
|
|
bc7f2fd9
|
2018-11-23T00:29:55
|
|
cmake: do not build both (SHARED and STATIC) for MSVC/win32
MSVC does not support SHARED and STATIC libraries with the same name,
so let's just build SHARED libraries by default instead (yes we can add
prefix but let's stick with this).
The reason for this is that in windows shared libraries requires .lib
file too, but this is not static library it is imported library for
shared (doh...), for more info [1] and [2].
[1]: https://docs.microsoft.com/en-us/windows/desktop/dlls/dynamic-link-library-creation
[2]: https://blogs.msdn.microsoft.com/oldnewthing/20091013-00/?p=16403
And when we build both static library can and will override shared
library imported part, let's take a look at event_extra.lib:
- before patch [3]:
$ less libevent-fail/lib/Debug/event_extra.lib | head
==> use library:contained_file to view a file in the archive
rw-rw-rw- 100666/100666 59568 Nov 21 23:55 2018 event_extra_static.dir/Debug/evrpc.obj
rw-rw-rw- 100666/100666 252219 Nov 21 23:55 2018 event_extra_static.dir/Debug/evdns.obj
rw-rw-rw- 100666/100666 203850 Nov 21 23:55 2018 event_extra_static.dir/Debug/http.obj
rw-rw-rw- 100666/100666 25907 Nov 21 23:55 2018 event_extra_static.dir/Debug/event_tagging.obj
[3]: https://ci.appveyor.com/project/azat/libevent/builds/20472024/job/t0o93v042jai0dj7
- "after patch" [4] (not after but the same effect):
$ less libevent-ok/lib/Debug/event_extra.lib | head
==> use library:contained_file to view a file in the archive
--------- 0/0 509 Nov 21 23:38 2018 event_extra.dll
...
[4]: https://ci.appveyor.com/project/azat/libevent/builds/20478998/job/ca9k3c76amc4qr76
Refs: #691
(cherry picked from commit 90d80ef4167d97b11e01e80fcc4eaa447712e92f)
|
|
eb10a738
|
2018-11-22T23:00:11
|
|
cmake: introduce EVENT__LIBRARY_TYPE option
Long time ago in [1] cmake build was forced to compile both libraries
(SHARED and STATIC), since this is how our autotools build works.
[1]: 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED and STATIC libraries (like autoconf does)")
And there is no way to configure this (and indeed you need to do this
for MSVC for example), so let's introduce option for this --
EVENT__LIBRARY_TYPE.
Plus now we have INTERFACE libraries, that we can use internally in
libevent's cmake rules to avoid strict to _shared/_static variant of the
libraries to link with samples/tests (we prefer SHARED over STATIC for
linking).
Also bump minimal cmake required version to 3.1 by the following
reasons:
- 3.1 is required for RPATH configuration under APPLE
- 3.0 is required for add_library(INTERFACE) (did not found it in 2.8.x
documentation)
- remove extra conditions
(anyway 3.1 was release 4 years ago, so I guess that most of the systems
will have it)
(cherry picked from commit c9a073eae8f86a74fbbb125db34b881ef40108b7)
|
|
a28c8346
|
2018-11-21T07:31:57
|
|
cmake: drop redundant add_dependencies()
(cherry picked from commit d705e8c0e924d3b815697a075c27a36298f04078)
|
|
6ea1ec68
|
2018-11-21T00:10:43
|
|
Merge branch 'TT_RETRIABLE'
* TT_RETRIABLE:
Mark a lot of flacky tests with TT_RETRIABLE (for linux/win32 only)
regress: introduce TT_RETRIABLE
Fixes: #704
(cherry picked from commit 4d2f013b5d20e674b22e5a8244f7fa63172dbdbf)
|
|
22609d66
|
2018-11-20T00:58:47
|
|
bufferevent: add debug messages when .setfd/.getfd/.enable/.disable failed
(cherry picked from commit 57765b23c81a9150ca0f77ed5f4d9b64a43cf30d)
|
|
a8cc449e
|
2018-11-14T00:20:20
|
|
http: improve error path for bufferevent_{setfd,enable,disable}()
We have calls to the next functions but do not check return values,
though they can be invalid and it is better to show this somehow.
Also do bufferevent_setfd() first and only after it
bufferevent_enable()/bufferevent_disable() since:
a) it is more natural
b) it will avoid extra operations
c) it will not fail first bufferevent_enable() (this is the case for
buffbufferevent_async at least)
In this case we could add more information for issues like #709
(cherry picked from commit b98d32d0c90864ff60bc689f3bcf738af58ca79c)
|
|
241780bd
|
2018-11-20T06:20:51
|
|
regress_http: fix compilation with !EVENT__HAVE_OPENSSL
Fixes: 811c63f7 ("regress: test for HTTP/HTTPS with IOCP enabled")
(cherry picked from commit 3036f15a176b038f42d3896463c39058c6bac943)
|
|
018ac6fd
|
2018-11-13T23:20:10
|
|
regress_bufferevent: add TT_IOCP_LEGACY/TT_IOCP
(cherry picked from commit f8d510f61777bcb194b945163b84047969a46cef)
|
|
77b587b3
|
2018-11-13T23:30:51
|
|
t/bench_http: disable buffering (win32 do not show anything otherwise)
Refs: #255
(cherry picked from commit 903c6acea52a2a2922b5cd43faec1e64631c3da8)
|
|
84f6fb41
|
2018-11-13T23:23:09
|
|
s/http-server: check for EVTHREAD_USE_WINDOWS_THREADS_IMPLEMENTED
(cherry picked from commit 56f3bdefcae915af3107ab20cc7548d048d56421)
|
|
6bfac964
|
2018-11-13T22:47:43
|
|
Merge branch 'iocp-fixes'
* iocp-fixes:
regress: test for HTTP/HTTPS with IOCP enabled
bev_async: trigger/run only deferred callbacks
bev_async: do not initialize timeouts multiple times
bev_async: set "ok" on setfd if fd>=0 (like we do during creation)
bev_async: ignore ERROR_INVALID_PARAMETER on .setfd for iocp
Closes: #709
Refs: nmathewson/Libevent#160
(cherry picked from commit 3d815cf22074792f31274fd6d810a94984661dbf)
|
|
6ac2ec25
|
2018-11-13T21:26:12
|
|
Fix conceivable UAF of the bufferevent in evhttp_connection_free()
Although this is not a problem, since bufferevent uses finalizers and
will free itself only from the loop (well this is not a problem if you
do not play games with various event_base in different threads) it
generates questions, so rewrite it in more reliable way.
Fixes: #712
(cherry picked from commit 5dc88b387f7baa4bcd528832e94987a85be3b263)
|
|
74517b2a
|
2018-11-30T22:25:41
|
|
Use BEV_UPCASE() everywhere
Done with coccinelle and manual line rewrap:
$ cat > BEV_UPCAST.cocci
@@
expression field_;
expression var;
@@
- EVUTIL_UPCAST(var, struct bufferevent_private, field_)
+ BEV_UPCAST(var)
$ spatch --sp-file BEV_UPCASE.cocci --in-place bufferevent*.c > /dev/null
(cherry picked from commit 7bcf576b396b22f218074c446691526a3ce509a6)
|
|
91bb15e6
|
2018-11-13T09:25:13
|
|
regress: add EVENT_NO_FILE_BUFFERING, to disable buffering for stdout/stderr
Useful for win32
(cherry picked from commit b2d4fb4176c645b45b8514e4a5a942228ea4e6a9)
|
|
ca69a10f
|
2018-11-13T08:24:55
|
|
event: add some debug information into loop for event_base_free_queues_()
Refs: 7c8d0152dda18ecc52d3099fea235b04ddb850d9 ("Free event queues even
for recursive finalizers")
(cherry picked from commit f2da6198401e2ef6763e5acc5d4e51a9928b9dde)
|
|
b6309bcc
|
2018-11-13T11:10:25
|
|
Merge branch 'sample-http-server'
Some improvements for http-server sample:
- getopt
- persistent port via -p option
- IOCP for win32 via -I
- disable buffering
- enable debug logging via -v/EVENT_DEBUG_LOGGING_ALL
- cleanup (by signal and separate error path on errors)
* sample-http-server:
s/http-server: graceful cleanup
s/http-server: enable debug logging if EVENT_DEBUG_LOGGING_ALL env isset
s/http-server: turn off buffering (otherwise do output on win32)
s/http-server: add an option to use IOCP
s/http-server: add options (for persistent port)
Refs: #709
(cherry picked from commit 9a4b8ec1b64fab27544f154076261afdf1efac07)
|
|
3bc602c2
|
2018-11-08T00:36:07
|
|
regress_ssl: fix ssl/bufferevent_wm_filter for non defered callbacks
Even after referenced patch there is still possible recursive callbacks
from evbuffer_drain(bev_input), i.e.:
wm_transfer() -> evbuffer_drain() -> wm_transfer()
inc(ctx->get)
But if we will increment ctx->get before drain that we will not add more
data to buffer.
Refs: 54c6fe3c ("regress_ssl: make ssl/bufferevent_wm_filter more fault-tolerance")
CI: https://ci.appveyor.com/project/nmathewson/libevent/build/job/f0rv299i71wnuxdq#L2546
(cherry picked from commit 1fc1c7ef1dabbbb358b99b893712bccc5761f82d)
|