3855 Commits

Author SHA1 Message Date
Azat Khuzhin
df2ed13f8f
Merge branch 'listener-immediate-close'
* listener-immediate-close:
  test/listener: cover immediate-close logic
  Immediately stop trying to accept more connections if listener disabled

(cherry picked from commit 416b48ba7a0b44407b7a053bd21830aa75d7162f)
2019-02-02 15:13:55 +03:00
Marcin Szewczyk
caceb8f558
Fixed last_with_datap description
Grammar and typo fix

(cherry picked from commit 88a1abe809e5d29618b722ff81ee2fb14119314f)
2019-02-02 15:13:55 +03:00
Azat Khuzhin
3375750ad7
Fix typo in cmake because of which EVENT__SIZEOF_SIZE_T was wrong
Fixes: #580
(cherry picked from commit 6e5c15d095d37036553d491b52d27fbbda08e7f2)
2019-02-02 15:13:55 +03:00
Greg Hazel
7d1ffe6474
CONNECT method only takes an authority
(cherry picked from commit 65eb529a9f4dd886d01a9d77ce6d971de9fb1b97)
2019-02-02 15:13:55 +03:00
yongqing.jiao
27dee54d03
If precise_time is false, we should not set EVENT_BASE_FLAG_PRECISE_TIMER
Fixes: 630f077c296de61c7b99ed83bf30de11e75e2740 ("Simple unit tests for
monotonic timers")

(cherry picked from commit 6cce7458d0f94e320f201eb5be94866e6918d66c)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
42e851bb8c
Merge branch 'evconnlistener-do-not-close-client-fd'
Fixes: #577

* evconnlistener-do-not-close-client-fd:
  listener: cover closing of fd in case evconnlistener_free() called from acceptcb
  Revert "Fix potential fd leak in listener_read_cb()"

(cherry picked from commit bc65ffc14c62c10feffefe6c3d9975ce1d1a8cd8)
2019-02-02 15:13:54 +03:00
Andrey Okoshkin
7fa08c4b75
Fix generation of LibeventConfig.cmake for the installation tree
'LIBEVENT_INCLUDE_DIRS' is properly initialized in 'LibeventConfig.cmake' as
'LibeventConfig.cmake.in' contains usage of 'LIBEVENT_CMAKE_DIR' and
'EVENT_INSTALL_INCLUDE_DIR' variables but not 'EVENT_CMAKE_DIR' and
'EVENT__INCLUDE_DIRS'.
Related typos are fixed.

(cherry picked from commit 6ee73ea9b0b15a9f4909c51e171b7799210ec26c)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
01bc36c1f4
Add missing includes into openssl-compat.h
Before it depends from the caller #include appropriate headers (at least
for OPENSSL_VERSION_NUMBER), but let's make it independent.

Fixes: #574
(cherry picked from commit c2c08e0203da93938fe35234fa3a1be4d1c3c2e1)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
27b59783f3
Free dns/event bases in dns-example to avoid leaks
(cherry picked from commit 33e363f3dfcd21f5125134395e4a7b3531bc3066)
2019-02-02 15:13:54 +03:00
ejurgensen
da4619b3c9
Fix incorrect ref to evhttp_get_decoded_uri in http.h
Replaces reference in the http.h include header file to evhttp_get_decoded_uri
with evhttp_uridecode. There is no function called evhttp_get_decoded_uri.

(cherry picked from commit b49c70cc2ed54f511e2b41f7ed61d357c88300be)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
b25813800f
Fix crashing http server when callback do not reply in place from *gencb*
This is the second hunk of the first patch
5ff8eb26371c4dc56f384b2de35bea2d87814779 ("Fix crashing http server when
callback do not reply in place")

Fixes: #567
(cherry picked from commit 306747e51c1f0de679a3b165b9429418c89f8d6a)
2019-02-02 15:13:54 +03:00
lightningkay
4a2373eec0
cmake doesn't has POLICY CMP0054 in low version
(cherry picked from commit 3f19c5eb8335500ca6f0dd3b62c32d06103757d0)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
23eb38b971
Allow bodies for GET/DELETE/OPTIONS/CONNECT
I checked with nginx, and via it's lua bindings it allows body for all
this methods. Also everybody knows that some of web-servers allows body
for GET even though this is not RFC conformant.

Refs: #408
(cherry picked from commit db483e3b002b33890fc88cadd77f6fd1fccad2d2)
2019-02-02 15:13:54 +03:00
Andreas Gustafsson
826f1134b8
Do not crash when evhttp_send_reply_start() is called after a timeout.
This fixes the crash reported in issue #509.  The "would be nice"
items discussed in #509 can be addressed separately.

(cherry picked from commit 99d0a952dada771b91acf63f5208b994e80a2986)
2019-02-02 15:13:54 +03:00
Azat Khuzhin
5b40744d15
Fix crashing http server when callback do not reply in place
General http callback looks like:
  static void http_cb(struct evhttp_request *req, void *arg)
  {
    evhttp_send_reply(req, HTTP_OK, "Everything is fine", NULL);
  }

And they will work fine becuase in this case http will write request
first, and during write preparation it will disable *read callback* (in
evhttp_write_buffer()), but if we don't reply immediately, for example:
  static void http_cb(struct evhttp_request *req, void *arg)
  {
    return;
  }

This will leave connection in incorrect state, and if another request
will be written to the same connection libevent will abort with:
  [err] ../http.c: illegal connection state 7

Because it thinks that read for now is not possible, since there were no
write.

Fix this by disabling EV_READ entirely. We couldn't just reset callbacks
because this will leave EOF detection, which we don't need, since user
hasn't replied to callback yet.

Reported-by: Cory Fields <cory@coryfields.com>
(cherry picked from commit 5ff8eb26371c4dc56f384b2de35bea2d87814779)
2019-02-02 15:13:53 +03:00
Azat Khuzhin
7e91622b68
fix handling of close_notify (ssl) in http with openssl bufferevents
Since it can arrive after we disabled events in that bufferevent and
reseted fd, hence evhttp_error_cb() could be called after
SSL_RECEIVED_SHUTDOWN.

Closes: #557
(cherry picked from commit da3f2ba22adcabaf7355a90d537b4928d0c168d2)
2019-02-02 15:13:53 +03:00
Kiyoshi Aman
532a8cc301
Port event_rpcgen.py and test/check-dumpevents.py to Python 3.
These scripts remain compatible with Python 2.

(cherry picked from commit 8b0aa7b36a3250fad4953f194c8a94ab25032583)
2019-02-02 15:13:53 +03:00
Azat Khuzhin
02312d506b
Remove OpenSSL paragram from README
Because it is mauvais ton to use binaries instead of normal packages
(like apt-get in debian, pacman in arch, and others).

Plus that link was borken and according to [1] OpenSSL do not ship
binaries officially.

And personally I don't think that this is not obvious that you need
openssl libraries to build libevent with it's support, and BTW you need
headers too (of course).

[1]: https://www.openssl.org/community/binaries.html
Fixes: #562

(cherry picked from commit 62866f98a5979e3b9ee8db0287be79749fcf7d6a)
2019-02-02 15:13:53 +03:00
Vincent JARDIN
7cc034c37d
test: fix warning
In function ‘send_a_byte_cb’:
test/regress.c:1853:2: warning: ignoring return value of ‘write’, declared with
attribute warn_unused_result [-Wunused-result]
  (void) write(*sockp, "A", 1);

(cherry picked from commit 56010f37ae5b49881f7fd255d5c8a936e1c36909)
2019-02-02 15:13:53 +03:00
Carlo Marcelo Arenas Belón
9c720b7073
configure: avoid false positive in DragonFlyBSD
by default, the max buffer size is 16K and histeresis is at 50%, so
a bigger read is needed to unlock writes than you would expect from
other BSD (512 bytes)

this doesn't introduce any regression on FreeBSD 11.1, OpenBSD 6.1, NetBSD 7.1,
macOS 10.12.6 and of course DragonFlyBSD 4.8.1, and most of them show
a max pipe size of 64K, so the read call should drain them all regardless
of how conservative they are on the free pipe space they will require
(usually 512 bytes) before kevent reports the fd as ready for write.

I couldn't find a reference to which bug this code was trying to look for
and it seems to be there from the beginning of git history so it might be
no longer relevant.

Issue: #548
(cherry picked from commit 1dfec8a97094a26317eac9b3d8a1c16eb1a7dbea)
2019-02-02 15:13:53 +03:00
Carlo Marcelo Arenas Belón
1811a040ef
test: avoid regress hanging in macOS
a backtrace of the process without this patch :
  * thread #1, queue = 'com.apple.main-thread', stop reason = signal SIGSTOP
    * frame #0: 0x00007fffb1fb7d96 libsystem_kernel.dylib`kevent + 10
      frame #1: 0x0000000108ed0a58 libevent-2.2.1.dylib`kq_dispatch + 696
      frame #2: 0x0000000108ec53d8 libevent-2.2.1.dylib`event_base_loop + 696
      frame #3: 0x0000000108e1763b regress`test_fork + 1931
      frame #4: 0x0000000108e5c7ad regress`run_legacy_test_fn + 45
      frame #5: 0x0000000108e690aa regress`testcase_run_one + 858
      frame #6: 0x0000000108e6954f regress`tinytest_main + 495
      frame #7: 0x0000000108e5c94b regress`main + 171
      frame #8: 0x00007fffb1e88235 libdyld.dylib`start + 1
      frame #9: 0x00007fffb1e88235 libdyld.dylib`start + 1

Issue: #546
(cherry picked from commit a86f89d333d870e6714bd28c695ba1774df3d7f5)
2019-02-02 15:13:53 +03:00
Carlo Marcelo Arenas Belón
b39ccf8e0b
autotools: confirm openssl is working before using
latest versions of macOS provide pkg-config and libraries for an ancient
version of openssl as part of the system, but no headers

(cherry picked from commit 506df426dbeb0187bbd3654bd286b4100628fb16)
2019-02-02 15:13:53 +03:00
Carlo Marcelo Arenas Belón
8983e5117b
test: fix 32bit linux regress
(cherry picked from commit 63c4bf78d6af3c6ff46d2e8e4b53dd9f577a9ca9)
2019-02-02 15:13:53 +03:00
Carlo Marcelo Arenas Belón
c2495265b1
autotools: pass $(OPENSSL_INCS) for samples (FTBFS macOS)
if OpenSSL is in a non standard location, need to pass that information
to any sample that needs it

Closes: #550
(cherry picked from commit 0ec5edde503096a81831f36441a4115574ac45f0)
2019-02-02 15:13:52 +03:00
Carlo Marcelo Arenas Belón
25150a629e
always define EV_INT16_MIN
somehow missing from 043ae7481f4a73b0f48055a0260afa454f02d136

(cherry picked from commit 5698cff73dac815dab937fd0262dd1f910ad1c3c)
2019-02-02 15:13:52 +03:00
Redfoxmoon
d433201e13
Add configure check for midipix
Fixes: #540
(cherry picked from commit 94e5cc84d5adf8075a1a98263d16756faec8ea30)
2019-02-02 15:13:52 +03:00
James Synge
43d92a6dab
Fix race in access to ev_res from event loop with event_active()
Detected using ThreadSanitizer, resolved by capturing the value
of ev_res in a local variable while the event is locked, then
passing that captured variable to the callback.

TSAN report:
  I0728 14:35:09.822118   WARNING: ThreadSanitizer: data race (pid=815501)
  I0728 14:35:09.822186     Write of size 2 at 0x7b2c00001bf2 by thread T80 (mutexes: write M1110835549570434736):
  I0728 14:35:09.822248       #0 event_active_nolock_ libevent/event.c:2893:14 (0a2b90577e830d775300664df77d0b91+0x1fdab28)
  I0728 14:35:09.822316       #1 event_active libevent/event.c:2858:2 (0a2b90577e830d775300664df77d0b91+0x1fdd10e)
  I0728 14:35:09.822379       #2 Envoy::Event::TimerImpl::enableTimer(std::chrono::duration<long, std::ratio<1l, 1000l> > const&) envoy/source/common/event/timer_impl.cc:24:5 (0a2b90577e830d775300664df77d0b91+0x459fa0)
  ...

  I0728 14:35:09.824146     Previous read of size 2 at 0x7b2c00001bf2 by main thread:
  I0728 14:35:09.824232       #0 event_process_active_single_queue libevent/event.c:1646:33 (0a2b90577e830d775300664df77d0b91+0x1fdf83d)
  I0728 14:35:09.824350       #1 event_process_active libevent/event.c (0a2b90577e830d775300664df77d0b91+0x1fd9ad8)
  I0728 14:35:09.824445       #2 event_base_loop libevent/event.c:1961 (0a2b90577e830d775300664df77d0b91+0x1fd9ad8)
  I0728 14:35:09.824550       #3 Envoy::Event::DispatcherImpl::run(Envoy::Event::Dispatcher::RunType) envoy/source/common/event/dispatcher_impl.cc:166:3 (0a2b90577e830d775300664df77d0b91+0x4576d9)
  ...

Fixes: #543 (pull-request)
(cherry picked from commit 27934f0b39991172dcfdad23faea9874dd386f10)
2019-02-02 15:13:52 +03:00
Azat Khuzhin
2bf8b0ff0e
Remove check against passed bufferevent in bufferevent_socket_connect()
It is a bit confusing to check against the result of EVUTIL_UPCAST(),
because it can return not NULL for NULL pointers, but for even though
with bufferevent we are fine (because bufferevent is the first field in
bufferevent_private), there are no checks for "bufev" in bufferevent's
API, so just remove it to make it generic.

Fixes: #542
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com>
(cherry picked from commit a10a6f4ed918ea1432820d99e9373f37f906d6f0)
2019-02-02 15:13:52 +03:00
Azat Khuzhin
9f4d0dceef
Fix wrong assert in evbuffer_drain()
"chain" cannot be NULL here because we have at least one chain (we
handle empty buffer separatelly) and hence loop will be executed at
least once.

Link: 841ecbd961 (commitcomment-23631347)
Signed-off-by: Ivan Maidanski <i.maidanski@samsung.com>
Signed-off-by: Azat Khuzhin <a3at.mail@gmail.com>
(cherry picked from commit b26996a05d9e7aad32e78a7bfab6454d5c11500a)
2019-02-02 15:13:52 +03:00
Azat Khuzhin
980394b98b
Merge remote-tracking branch 'official/pr/527' -- documentation fixes
* official/pr/527:
  Fix a few trivial documentation typos
  Clarify event_free() documentation regarding pending/active events

(cherry picked from commit e83443ec67d45447296c2ce320620a07c88e1d32)
2019-02-02 15:13:52 +03:00
Ondřej Kuzník
c46ff4393a
Fix tests with detached builds
Closes: #524
(cherry picked from commit cf7f5b0dc484152ae3be7ea6ba57552595891608)
2019-02-02 15:13:52 +03:00
Nikolay Edigaryev
59240e83fa
Document some obvious cases where a function might also return NULL
Closes: #525
(cherry picked from commit 808524252f888303e4e95f09c3f8c225ef08f096)
2019-02-02 15:13:52 +03:00
Azat Khuzhin
802be13afd
Fix event_debug_logging_mask_ exporting on win32
(cherry picked from commit cd285e425a906276efafab901d1b9da0e388be48)
2019-02-02 15:13:52 +03:00
Azat Khuzhin
a1f28e2f9c
Fix visibility issues under (mostly on win32)
Refs: #511
Fixes: 7182c2f561570cd9ceb704623ebe9ae3608c7b43 ("cmake: build SHARED and
STATIC libraries (like autoconf does)")

(cherry picked from commit ce3af533f1b11c4b302d404483f28660eb5d7190)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
6f74954017
cmake: set CMP0054 to NEW to avoid variables over expansion (since cmake 3.8)
==> win: CMake Warning (dev) at CMakeLists.txt:782 (elseif):
==> win:   Policy CMP0054 is not set: Only interpret if() arguments as variables or
==> win:   keywords when unquoted.  Run "cmake --help-policy CMP0054" for policy
==> win:   details.  Use the cmake_policy command to set the policy and suppress this
==> win:   warning.
==> win:
==> win:   Quoted variables like "MSVC" will no longer be dereferenced when the policy
==> win:   is set to NEW.  Since the policy is not set the OLD behavior will be used.
==> win: This warning is for project developers.  Use -Wno-dev to suppress it.

(cherry picked from commit 2773a5ed5e75540d43500e054581ea1fab2132ac)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
3e69029008
cmake: fix building bench/bench_cascade under win32 (missing getopt)
Because of typo in cmake, now rewrote to make it less error prone (since even
for non-win32 there are variables overlap).

(cherry picked from commit 8b29b136793f3bfdb22fba117527763434363a3f)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
d2a41a50a8
cmake: avoid requiring cmake 3.1 on win32 for dns-example
Avoid using target_sources() from cmake 3.1, just pass needable sources as
list.

(cherry picked from commit 346f8e17080f4649986e0d48176c0a0a5618ea98)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
449f5a5746
le-proxy: fix compiling under win32 (because of no "inline" in C)
Include <util-internal.h> for regular "inline", since it is used everywhere.

(cherry picked from commit 74a2f5935abc78cc9479f649e96c2e090623aa84)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
c544222f19
http-connect: exit on error
(cherry picked from commit d22e12eefa11aab34b95e8b07b823f3ad0597239)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
300a0dc6e0
test: do not use .fieldname in structure initializations (fixes win32)
Fixes: #497
(cherry picked from commit 15da23cfdbeb5d5b4eeafca0cd93962c26641ae5)
2019-02-02 15:13:51 +03:00
Azat Khuzhin
822d646276
Add missing print-winsock-errors.c into dist archive
Refs: #497
(cherry picked from commit 8d89c212587c560df8cd7089fb1a2fcd2a3dca82)
2019-02-02 15:13:51 +03:00
Maximilian Brunner
56a520035b
le-proxy: add missing return statement (UAF)
Refs: #501501501501501501501501501
(cherry picked from commit 00ae45fe53e9e01f61f97c90deba1deb6ac1bc9f)
2019-02-02 15:13:51 +03:00
José Luis Millán
876c7ac7ff
Return from event_del() after the last event callback termination
Delete the event from the queue before blocking for the current
event callback termination.

Ensures that no callback is being executed when event_del() returns,
hence making this function a secure mechanism to access data which is
handled in the event callack.

Fixes: #236
Fixes: #225
Refs: 6b4b77a
Fixes: del_wait
(cherry picked from commit 0b4b0efdb8ee710ccae5bad320fc24843fd428e5)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
23db747652
test: cover that after event_del() callback will not be scheduled again
Refs: #236
Refs: #225
(cherry picked from commit 5ff83989f30daef93a851c2162667375ed1663a5)
2019-02-02 15:13:50 +03:00
Gonçalo Ribeiro
5dbcae8578
Correct URL for the libevent logo
(cherry picked from commit f988c5ca0eb654a8e60df174abfc63dd9476be5e)
2019-02-02 15:13:50 +03:00
David Benjamin
29b7a516fd
Explicitly call SSL_clear when reseting the fd.
If reconnecting the via BEV_CTRL_SET_FD, bufferevent_openssl.c expects
OpenSSL to reuse the configuration state in the SSL object but retain
connection state. This corresponds to the SSL_clear API.

The code currently only calls SSL_set_connect_state or
SSL_set_accept_state. Due to a quirk in OpenSSL, doing this causes the
handshake to implicitly SSL_clear the next time it is entered. However,
this, in the intervening time, leaves the SSL object in an odd state as
the connection state has not been dropped yet. This behavior also does
not appear to be documented by OpenSSL.

Instead, call SSL_clear explicitly:
https://www.openssl.org/docs/manmaster/man3/SSL_clear.html

(cherry picked from commit c6c74ce2652fd02527a1212e36cbfd788962132a)
2019-02-02 15:13:50 +03:00
Dominic Chen
56faf02bae
bufferevent: refactor to use type check macros
(cherry picked from commit 92cc0b9c3db38088f79c5d1e432c429fbc366968)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
303d6d77c7
Fix arc4random_addrandom() detecting and fallback (regression)
But this is kind of hot-fix, we definitelly need more sane arc4random
compat layer.

Fixes: #488
Introduced-in: 6541168 ("Detect arch4random_addrandom() existence")
(cherry picked from commit 266f43af7798befa3d27bfabaa9ae699259c3924)
2019-02-02 15:13:50 +03:00
Azat Khuzhin
27a2ef5c8b
Make event_count macros cleaner
Fixes: #489
(cherry picked from commit 177e2171cb44e3929fbb0ec43b1bffb325b0e8ed)
2019-02-02 15:13:50 +03:00
Xiang Zhang
7f0a7564c3
fix evutil_make_internal_pipe_'s comment that fd[0] for read and f[1] for write
(cherry picked from commit 2e52bace9f9998826bd3819af328efc8d18decf9)
2019-02-02 15:13:50 +03:00