|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
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)
|
|
1b6ce89b
|
2018-11-06T11:30:18
|
|
appveyor: skip travis patches (by commit subject/files)
(cherry picked from commit 9afe7a6c12c112a6cbc49cf1bd684781275b2579)
|
|
cb8b6f17
|
2018-11-05T17:04:47
|
|
appveyor: cache build directory to reduce overall time (6x time faster)
various build checks (i.e. detecting headers/macroses/functions) takes
7 minutes (from 13 minutes in total) for cmake, which is too high.
By using cache we can reduce this to ~0.
And set APPVEYOR_SAVE_CACHE_ON_ERROR so that cmake checks will be
cached (anyway all sources will be built from scratch due to timestamp
updates while extracting from sources).
(cherry picked from commit 54fdd6bb6ebe6b0a672c79d30a712d97536500c8)
|
|
2ffa59da
|
2018-11-06T01:22:13
|
|
appveyor: disable verbosity
(cherry picked from commit 506189350889dd7270801f3383524eb2acbfb862)
|
|
e7292a59
|
2018-11-05T18:00:41
|
|
appveyor: do not run on branches that has "travis" in it's name
(cherry picked from commit 1503a9a1a6aea641784fa7aae83ad00e57e35431)
|
|
5e5de36f
|
2018-11-05T18:30:38
|
|
cmake: set CMP0075 to NEW (for ws2_32.lib in win32)
Otherwise cmake complains:
Policy CMP0075 is not set: Include file check macros honor
CMAKE_REQUIRED_LIBRARIES. Run "cmake --help-policy CMP0075" for policy
details. Use the cmake_policy command to set the policy and suppress this
warning.
CMAKE_REQUIRED_LIBRARIES is set to:
ws2_32.lib
For compatibility with CMake 3.11 and below this check is ignoring it.
(cherry picked from commit 6d3a53966bc822fd580a6a02301838aca601391b)
|
|
3d3d1e05
|
2018-11-05T18:23:31
|
|
cmake: set CMP0074 to NEW (for OPENSSL_ROOT in appveyor)
We have $env:OPENSSL_ROOT (env) equals to -DOPENSSL_ROOT (cmake
variable) anyway.
cmake complains:
Policy CMP0074 is not set: find_package uses <PackageName>_ROOT variables.
Run "cmake --help-policy CMP0074" for policy details. Use the cmake_policy
command to set the policy and suppress this warning.
Environment variable OpenSSL_ROOT is set to:
C:/OpenSSL-Win64/bin
For compatibility, CMake is ignoring the variable.
This warning is for project developers. Use -Wno-dev to suppress it.
(cherry picked from commit 65904773f2bf965e2050d4d7c91e30d4f123a787)
|
|
b021b979
|
2018-11-05T22:58:25
|
|
travis: use homebrew via addon (-~4min/16% from the build time)
(cherry picked from commit 58e853f2c54dca223cd2d42665e74c2208c84cf1)
|
|
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)
|
|
98d0f923
|
2018-11-05T22:25:15
|
|
regress_ssl: make ssl/bufferevent_wm_filter more fault-tolerance
Due to inplace callbacks (i.e. no BEV_OPT_DEFER_CALLBACKS) we cannot be
sure that wm_transfer() will not be called recursively and indeed it
still happens sometimes, and the referenced patch increase amount of
this times, especially for linux/poll.
Fixes: 66304a23cf748714159c988e78f35401c5352827 ("Fix
ssl/bufferevent_wm_filter when bev does not reach watermark on break")
(cherry picked from commit 54c6fe3c06cb5342130467ecf0f78e3f6d854a36)
|
|
35ca9643
|
2018-11-05T21:33:54
|
|
regress_http: disable http/read_on_write_error under win32
EVHTTP_CON_READ_ON_WRITE_ERROR works only if an error already read from
the socket, but if we already got EPIPE on write we cannot read from the
socket anymore, and win32 does not guarantee that read will happens
before (although it happens from time to time).
In the referenced patch I just replaced callback with not expecting 417,
but like I already wrote, this is not always true (i.e. it is flacky).
Fixes: 3b581693ac1967f7f8d98491cb772a1b415eb4cd ("test/http:
read_on_write_error: fix it for win32")
(cherry picked from commit 9040707fb176040acf250b09a223d6b4400f4086)
|
|
f12cd17b
|
2018-11-05T18:02:05
|
|
travis-ci: exclude appveyor branches
(cherry picked from commit 0345adf7e43d0c776f73edf95b0648dbb43fdf52)
|
|
b52c6498
|
2018-11-04T19:48:11
|
|
cmake: do not detect _GNU_SOURCE/__GNU_LIBRARY__ if it is cached
(cherry picked from commit 3ed93997387296e374d8a2dd770e43ddfa3328e9)
|
|
30020a35
|
2018-11-04T21:41:20
|
|
Merge branch 'ssl_bufferevent_wm_filter-fix'
* ssl_bufferevent_wm_filter-fix:
Fix ssl/bufferevent_wm_filter when bev does not reach watermark on break
regress_ssl: cover watermarks with deferred callbacks
regress_ssl: improve bufferevent_wm/bufferevent_wm_filter logging
(cherry picked from commit 9d93fbe77968da5ca5b2dbe8973e6f3c3045c5ba)
|
|
6594bfb4
|
2018-11-02T23:43:57
|
|
regress_http: make https_basic non time dependent
Fixes: #454
(cherry picked from commit e29afd4b9428631444b208edfe3a4ba6ce4423af)
|
|
a39898f3
|
2018-11-04T01:21:48
|
|
Merge branch 'check-O_NONBLOCK-in-debug'
* check-O_NONBLOCK-in-debug:
regress: use non blocking descriptors whenever it is possible
assert that fds are nonblocking in debug mode
Closes: nmathewson/Libevent#90
(cherry picked from commit 6f988ee161680925fc3308f17d293c680e3ac916)
|
|
bf3a67cf
|
2018-10-31T06:34:40
|
|
Add cmake rules into dist archive
Fixes: #502
Refs: #551
(cherry picked from commit 69bc2da79fb2f358c22feba45e9ad4752729d320)
|
|
ca4b6404
|
2018-10-31T01:22:30
|
|
Merge branch 'event-ET-#636-v2'
* event-ET-#636-v2:
Preserve ET bit for backends with changelist
Epoll ET setting lost with multiple events for same fd
Cover ET with multiple events for same fd
Add ET flag into event_base_dump_events()
Fixes: #636
(cherry picked from commit 33053cdd8a9e1a7330b47759dee9cb209bed8f1b)
|
|
5e97b6e6
|
2018-10-28T20:52:32
|
|
appveyor: reconfigure tests with allow_failure and fast_finish
(cherry picked from commit e17e1ee91d292e8a1c7b6ac9e76dd29906d517dc)
|
|
349081e1
|
2018-10-28T19:48:37
|
|
Merge branch 'win32-visibility-event_debug_logging_mask_'
* win32-visibility-event_debug_logging_mask_:
Introduce EVENT_VISIBILITY_WANT_DLLIMPORT
regress_http: use TT_BLAZER() over event_debug()
Fixes: #702
(cherry picked from commit fb8666453ce8bb1d599a68636bed5db5ef4a7a57)
|
|
1c865238
|
2018-10-28T18:11:22
|
|
Check existence of IPV6_V6ONLY in evutil_make_listen_socket_ipv6only() (mingw32)
MinGW 32-bit 5.3.0 does not defines it and our appveyour [1] build
reports this instantly:
evutil.c: In function 'evutil_make_listen_socket_ipv6only':
evutil.c:392:40: error: 'IPV6_V6ONLY' undeclared (first use in this function)
return setsockopt(sock, IPPROTO_IPV6, IPV6_V6ONLY, (void*) &one,
[1]: https://www.appveyor.com/docs/windows-images-software/#mingw-msys-cygwin
Another solution will be to use mingw64 which has it, but I guess we do
want that #ifdef anyway.
(cherry picked from commit 23e79fd764b9f36f560d470f0fb60295dd942ac2)
|
|
12e0d889
|
2018-10-28T16:46:24
|
|
Convert evbuffer_strspn() (internal helper) to use size_t
As pointed by @yankeehacker in #590:
Signed to Unsigned Conversion Error - buffer.c:1623
Description: This assignment creates a type mismatch by populating an
unsigned variable with a signed value. The signed integer will be
implicitly cast to an unsigned integer, converting negative values into
positive ones. If an attacker can control the signed value, it may be
possible to trigger a buffer overflow if the value specifies the length
of a memory write.
Remediation: Do not rely on implicit casts between signed and unsigned
values because the result can take on an unexpected value and violate
weak assumptions made elsewhere in the program.
Fixes: #590
(cherry picked from commit 931ec2370228e40309af51b86e10fa364a37a20e)
|
|
5e439e50
|
2018-10-28T15:16:24
|
|
buffer: add an assert for last_with_datap to suppress static analyzer
../buffer.c:2231:6: warning: Access to field 'flags' results in a dereference of a null pointer
if (CHAIN_SPACE_LEN(*firstchainp) == 0) {
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
../buffer.c:130:30: note: expanded from macro 'CHAIN_SPACE_LEN'
#define CHAIN_SPACE_LEN(ch) ((ch)->flags & EVBUFFER_IMMUTABLE ? \
(cherry picked from commit f83ac92da9fff789135d1e5b9050653cf7fdb517)
|
|
2ad11022
|
2018-10-28T02:00:16
|
|
bench_cascase: include getopt.h only for _WIN32 (like in other places)
Fixes: #561
(cherry picked from commit fb42e0fac60d31e081cce4c19df6061bcb56df20)
|
|
a2176f2c
|
2017-09-23T06:57:16
|
|
Define __EXT_POSIX2 for QNX
POSIX 1003.2 extension is necessary for getopt interface.
Reported here [1] (not mine, I can't test)
[1]: https://mail-index.netbsd.org/pkgsrc-users/2017/09/20/msg025601.html
Closes: #563 (cherry-pick)
(cherry picked from commit 99a3887d66885204ed8fa13405ae04b632dc8d33)
|
|
f895e17e
|
2018-10-27T19:34:52
|
|
regress_ssl: reset static variables on test setup/cleanup and eliminate leaks
One tricky bit is reply to the BIO_C_GET_FD command, since otherwise it
will try to close(0) and accepted bev in ssl/bufferevent_connect_sleep
will leak. Other seems more or less trivial.
This was done to make sure that for at least generic cases does not
leak (tricky cases was listed here nmathewson/Libevent#83).
And this will allow run ssl/.. with --no-fork
(cherry picked from commit 9fe952a0aea25474de3dbc30350b1ffa5abcd65a)
|
|
a9a5cf4d
|
2018-10-27T19:41:52
|
|
test: export basic_test_setup/basic_test_cleanup to extend them
(cherry picked from commit 7cec9b95a3aefb85fcf75610abc8e27e284b251d)
|
|
d76823d4
|
2018-10-27T23:58:18
|
|
travis-ci: do not notify irc.oftc.net#libevent
I think that this just introduce noise that people just turns off. So
very questionable let's remove it.
(cherry picked from commit 5264c03f8a8ac759ef42e5dfdfb3fda0accd12f6)
|
|
e86ccfe5
|
2018-10-27T18:35:08
|
|
be_openssl: avoid leaking of SSL structure
From nmathewson/Libevent#83 by @fancycode:
There are a few code paths where the passed SSL object is not released in error cases, even if BEV_OPT_CLOSE_ON_FREE is passed as option while for others it is released. That way it's impossible for the caller to know it he has to free it on errors himself or not.
Line numbers are from "bufferevent_openssl.c" in 911abf3:
L1414 ("underlying == NULL" passed)
L1416 (bio could not be created)
L1446 (different fd passed)
L1325 (both underlying and fd passed)
L1328 (out-of-memory)
L1333 ("bufferevent_init_common_" failed)
In all error cases after the "bufferevent_ops_openssl" has been assigned, the option is evaluated on "bufferevent_free" (L1399) and the SSL object released (L1226).
Fixes: nmathewson/Libevent#83
(cherry picked from commit acf09c00e2825420cc4ff801518e4ecfe2b31a03)
|
|
83275459
|
2018-10-27T18:29:57
|
|
be_openssl: drop close_flag parameter of the BIO_new_bufferevent()
(cherry picked from commit 474d72aeac818198737aa7cb009578c464db11ca)
|
|
f3aa6a47
|
2018-10-27T17:36:09
|
|
regress_http: basic evhttp_parse_query_str() coverage
(cherry picked from commit d161ec3842259f2896fc9b15a1e4d5a1ed178bb2)
|
|
acf4821d
|
2018-10-27T14:58:30
|
|
cmake: add various warning flags like autotools has
This is mostly to match autotools and reduce amount mixiing declarations
and code.
Added:
- -Wextra (the same as -W), -Wno-unused-parameter -Wstrict-aliasing
- -fno-strict-aliasing (gcc 2.9.5+)
- -Winit-self -Wmissing-field-initializers -Wdeclaration-after-statement (4.0+)
- -Waddress -Wno-unused-function -Wnormalized=id -Woverride-init (4.2+)
- -Wlogical-op (4.5+)
Removed:
- -Wformat (include in -Wall)
Plus use CMAKE_C_COMPILER_ID over CMAKE_COMPILER_IS_GNUCC, as
cmake-variables(7) suggesting, and add common GNUC/CLANG variables.
v2: drop checks for flags, since add_compiler_flags() will check if such
flags exists anyway (but just to note, gcc ignores non existing warning
flags by default).
(cherry picked from commit 8348b41308a7126d009bb6e0b33aa5f465e1dc33)
|
|
bff1423d
|
2018-10-27T16:49:39
|
|
autotools: do not add warnings that is included into -Wall already
Plus remove duplicates
(cherry picked from commit 006c528a21f8beec8993134c12610bd16cde7fff)
|
|
ba148796
|
2018-06-04T16:43:34
|
|
listener: ipv6only socket bind support
According to RFC3493 and most Linux distributions, default value is to
work in IPv4-mapped mode. If there is a requirement to bind same port
on same ip addresses but different handlers for both IPv4 and IPv6,
it is required to set IPV6_V6ONLY socket option to be sure that the
code works as expected without affected by bindv6only sysctl setting
in system.
See an example working with this patch:
https://gist.github.com/demirten/023008a63cd966e48b0ebcf9af7fc113
Closes: #640 (cherry-pick)
(cherry picked from commit 387d91f9ab95df8ac3d7bb58493310ad4a377dcf)
|
|
b07e43e6
|
2018-10-25T00:50:50
|
|
Merge branch 'evutil_found_ifaddr-dev'
* evutil_found_ifaddr-dev:
Cover evutil_v4addr_is_local_()/evutil_v6addr_is_local_()
Split evutil_found_ifaddr() into helpers (evutil_v{4,6}addr_is_local())
Use INADDR_ANY over 0 in evutil_found_ifaddr()
Replace EVUTIL_V4ADDR_IS_*() macroses with static inline functions
Filter link-local IPv4 addresses in evutil_found_ifaddr()
(cherry picked from commit b2667b76969c2ea382373f885062b45e82d0ac59)
|
|
cdcfbafe
|
2018-10-23T00:12:23
|
|
Merge branch 'http-request-line-parsing'
* http-request-line-parsing:
Fix http https_basic/https_filter_basic under valgrind (increase timeout)
http: cover various non RFC3986 conformant URIs
http: allow non RFC3986 conformant during parsing request-line (http server)
http: do not try to parse request-line if we do not have enough bytes
http: allow trailing spaces (and only them) in request-line (like nginx)
http: cleanup of the request-line parsing
(cherry picked from commit 0ec12bc84cf09307e01dc3b00d08ac1f816b6ff7)
|
|
698ebed6
|
2018-10-22T01:06:48
|
|
Disable parallel jobs for the osx (due to CPU time deficit) in travis-ci
As you can see right now linux workers has zero failed tests, while osx
workers has 18 failed tests:
[bufferevent_connect_hostname_emfile FAILED]
[bufferevent_pair_release_lock FAILED]
[bufferevent_timeout FAILED]
[bufferevent_timeout_filter FAILED]
[bufferevent_timeout_pair FAILED]
[common_timeout FAILED]
[del_wait FAILED]
[immediatesignal FAILED]
[loopexit FAILED]
[loopexit_multiple FAILED]
[monotonic_res FAILED]
[no_events FAILED]
[persistent_active_timeout FAILED]
[persistent_timeout_jump FAILED]
[signal_switchbase FAILED]
[signal_while_processing FAILED]
[simpletimeout FAILED]
[usleep FAILED]
And this patch should remove from this list time related failures
(though maybe not all of them).
(cherry picked from commit 2f43d1d4091f4f87b8679de4b4967561861141de)
|