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()"
@kgraefe:
"I believe that this commit is just wrong: if lev->cnt is not 1 after
the callback, new_fd will still never be closed in listener_read_cb().
So in that case it is the responsibility of the user's code to close
the file descriptor (which is fine). But why shouldn't it be in the
other case? And how does the user's code know?"
Andrey Okoshkin [Wed, 29 Nov 2017 08:13:51 +0000 (11:13 +0300)]
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.
ejurgensen [Sun, 5 Nov 2017 11:18:49 +0000 (12:18 +0100)]
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.
Azat Khuzhin [Sun, 29 Oct 2017 19:53:41 +0000 (22:53 +0300)]
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.
Azat Khuzhin [Sun, 22 Oct 2017 21:13:37 +0000 (00:13 +0300)]
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.
Azat Khuzhin [Sun, 24 Sep 2017 12:12:13 +0000 (15:12 +0300)]
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).
Vincent JARDIN [Mon, 11 Sep 2017 19:56:30 +0000 (21:56 +0200)]
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);
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.
James Synge [Mon, 7 Aug 2017 15:06:28 +0000 (11:06 -0400)]
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.
Azat Khuzhin [Mon, 14 Aug 2017 20:11:53 +0000 (23:11 +0300)]
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>
Currently it's not clear as to whether "first make it non-pending and
non-active" sentence requires user to take some action (e.g. call event_del(),
which event_free() already does internally) or just describes what this
function does from the developer point of view.
Azat Khuzhin [Mon, 29 May 2017 17:46:33 +0000 (20:46 +0300)]
Make event_debug_get_logging_mask_() real symbol (win32)
I cannot made it work without this, even though dumpbin shows that that symbol
exists in the event_core.dll, event_extra.dll failed to compile:
==> win: Creating library C:/vagrant/.cmake-vagrant/lib/Debug/event_extra.lib and object C:/vagrant/.cmake-vagrant/lib/Debug/event_extra.exp
==> win: http.obj : error LNK2001: unresolved external symbol _event_debug_logging_mask_ [C:\vagrant\.cmake-vagrant\event_extra_shared.vcxproj]
==> win: C:\vagrant\.cmake-vagrant\bin\Debug\event_extra.dll : fatal error LNK1120: 1 unresolved externals [C:\vagrant\.cmake-vagrant\event_extra_shared.vcxproj]
==> win: Done Building Project "C:\vagrant\.cmake-vagrant\event_extra_shared.vcxproj" (default targets) -- FAILED.
And dumpbin:
sh-4.1$ /cygdrive/c/Program\ Files\ \(x86\)/Microsoft\ Visual\ Studio\ 12.0/VC/bin/amd64/dumpbin.exe /EXPORTS ./bin/Debug/event_core.dll
M
202 C9 00059A3C event_debug_logging_mask_ = _event_debug_logging_mask_
Azat Khuzhin [Mon, 29 May 2017 15:48:48 +0000 (18:48 +0300)]
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.
José Luis Millán [Mon, 13 Apr 2015 06:54:52 +0000 (08:54 +0200)]
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.
David Benjamin [Thu, 20 Apr 2017 22:03:50 +0000 (18:03 -0400)]
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.
Azat Khuzhin [Tue, 14 Mar 2017 10:33:31 +0000 (13:33 +0300)]
cmake: use APPEND during exporting targets (for old cmake)
On centos with cmake 2.8.12.2:
CMake Error at cmake/AddEventLibrary.cmake:92 (export):
export called with target "event_extra_shared" which requires target
"event_core_shared" that is not in the export list.
If the required target is not easy to reference in this call, consider
using the APPEND option with multiple separate calls.
Azat Khuzhin [Tue, 14 Mar 2017 10:31:02 +0000 (13:31 +0300)]
Merge branch 'win32-fixes'
This patchset fixes win32 builds after some previous patches (referenced
in particular commits), and also removes some quirks for win32.
* win32-fixes:
test: do not return void
log/win32: fix exporting extern variable
log-internal: missing extern "C"
log: remove USE_GLOBAL_FOR_DEBUG_LOGGING
cmake: Export missing symbols for win32
cmake: eliminate EVENT_BUILDING_REGRESS_TEST, since we link with shared libs
test: windows doesn't have WNOWAIT
cmake: clean not used #defines from event-config.h
cmake: add <pthread.h> only for non-win32
Azat Khuzhin [Mon, 13 Mar 2017 18:05:32 +0000 (21:05 +0300)]
Merge branch 'cmake-missing-bits'
This patchset adds next missing things (in compare to autotools):
- pkgconfig
- event_pthreads/event_openssl
- compile shared/static libraries always
And some fixes, because it will not build after fixing other things:
- export missing symbols for cmake (-fvisibility=hidden)
* cmake-missing-bits:
cmake: support visibility for AppleClang too
cmake: fix export absolute path and relative path and cleanup a bit
cmake: generate and install pkgconfig files
cmake: build SHARED and STATIC libraries (like autoconf does)
cmake: add missing event_openssl/event_pthreads libraries
Export symbols for -fvisibility=hidden (under cmake)
Azat Khuzhin [Mon, 13 Mar 2017 12:49:11 +0000 (15:49 +0300)]
cmake: support visibility for AppleClang too
Defaults apple linker behaviour is -two_levelnamespace, and you cannot
use "-undefined suppress" with it, so let's link non event_core with
event_core library to avoid undefined symbols.
Azat Khuzhin [Mon, 13 Mar 2017 00:18:02 +0000 (03:18 +0300)]
cmake: fix export absolute path and relative path and cleanup a bit
Remove next vars, since I don't think that somebody want to change it:
- bin
- lib
- include
And fix exports problem:
CMake Error: INSTALL(EXPORT "LibeventTargets") given absolute DESTINATION "/usr/lib/cmake/libevent" but the export references an installation of target "event_core_static" which has relative DESTINATION "lib".
Azat Khuzhin [Sun, 12 Mar 2017 10:12:53 +0000 (13:12 +0300)]
travis-ci: do not run coverage on osx
First of all we don't really need two of them, and also with apple-clang
it will fail (because of our checks in cmake), so just exclude it from
the build matrix.
Azat Khuzhin [Wed, 8 Mar 2017 20:15:33 +0000 (23:15 +0300)]
Do not add epoll_sub (syscall wrappers) for epoll in cmake
Nowadays mostly all supported OS'es has this wrappers, and some of them (like
SmartOS) has wrappers but doesn't have __NR_epoll* defines for syscall numbers,
so just drop them (instead of adding yet another check int cmake like autotools
has, since this will break building in cross-compile environment).
Also one minor note, configure doesn't added epoll_sub.c either, since it check
epoll_create() in runtime.
And I tested it in SmartOS and it even works (`make verify`).
Azat Khuzhin [Wed, 8 Mar 2017 14:58:26 +0000 (17:58 +0300)]
Merge branch 'cmake-configure-fixes-v2'
Fixes in cmake, to make it more like configure and support some
cross-compiling.
* cmake-configure-fixes-v2:
cmake: fix extracting of the version from git (check for number of matches)
Detect arch4random_addrandom() existence
Use off_t instead of ev_off_t for sendfile() (fixes android build)
cmake: detect _GNU_SOURCE not by __GNU_LIBRARY__ only (fallback to _GNU_SOURCE)
Check for WNOWAIT in waitpid() in runtime (not in cmake/configure)
cmake: add <pthread.h> into CMAKE_REQUIRED_INCLUDES for sizeof(pthread_t)
cmake: fix values for #cmakedefine
cmake: drop duplicates from event-config template
cmake: add value for the #cmakedefine macros (like autoconf)
cmake: Fix checking of enum values from sysctl.h
Azat Khuzhin [Sun, 5 Mar 2017 23:46:23 +0000 (02:46 +0300)]
Merge branch 'fix-openssl-linking'
* fix-openssl-linking:
sample/https-client: use ERR_remove_*state() when we have them
Do not check for ERR_remove_thread_state() (do not link ssl into every library)
Calling AC_SEARCH_LIBS() modifies LIBS - -lcrypto incorrectly
ends up in LIBS, and thus linked to by libevent_core.so.
Checking for ERR_remove_thread_state should no longer be needed
because it was introduced in openssl 1.0.0, and the previous line
0.9.8 had support discontinued at the end of 2015.
Trond Norbye [Tue, 21 Feb 2017 11:54:02 +0000 (12:54 +0100)]
Fix RPATH for APPLE
By setting the CMake minimum version to 3.1 CMake automatically
adds the correct magic to make the library relocatable on
the filesystem (instead of burning the location of the library
at link time into the binary).
ex:
otool -L bin/http-connect
bin/http-connect:
@rpath/libevent_extra.2.2.0.dylib (compatibility version 2.2.0, current version 0.0.0)
/usr/lib/libz.1.dylib (compatibility version 1.0.0, current version 1.2.8)
/usr/lib/libSystem.B.dylib (compatibility version 1.0.0, current version 1238.0.0)
David Disseldorp [Mon, 20 Feb 2017 13:47:59 +0000 (14:47 +0100)]
sample/https-client: use host SSL certificate store by default
Currently a static (Debian) certificate path is used by default, which
can be overridden using the -crt parameter. This commit changes the
default behaviour such that the openssl default certificate store is
used, unless overridden by -crt.
Azat Khuzhin [Sun, 29 Jan 2017 20:07:40 +0000 (23:07 +0300)]
Merge branch 'fix-struct-linger'
@jbech
"Accidentally disabled by 0dda56a due to confusion between struct
linger vs. SO_LINGER and #define vs. AC_DEFINE. Try adding synthetic
#error test to confirm."
* fix-struct-linger:
cmake: check for 'struct linger' existence
test/bench*: prefix event-config.h macros after 0dda56a48e94
test/bench_httpclient: restore SO_LINGER usage after 0dda56a48e94