summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-01-27Avoid incorrect call to the previous reply's callback (#1040)Bjorn Svensson
* No reuse of the previous reply callback When multiple replies are parsed from a socket in one read a previously found callback might get reused when the current reply has no known callback. This can be triggered by the added testcase which unsubscribe to subscribed (A,B) and a non-subscribed channel (X). Without this correction a callback for wrong channel is called. - In 'unsubscribe B X A', B's callback is called when handling X. - Now this is not done, i.e. there is no callback called for X. * Re-push monitor callback for each reply MONITORING used the same callback for all replies while parsing multiple responses. This handling was changed to avoid calling the wrong callback in some scenarios. Now also change monitorings repush to work with this change. Includes an added async monitoring testcase.
2022-01-24fix building on AIX and SunOS (#1031)Dietmar Scheidl
2022-01-18Add timeout support for libuv adapter (#1016)MichaelSuen
Add timeout to libuv adapter Co-authored-by: sunmingqi <sunmingqi@corp.netease.com> Co-authored-by: sunmingqi <smq222@126.com> Co-authored-by: Michael Grunder <michael.grunder@gmail.com> Co-authored-by: Viktor Söderqvist <viktor@zuiderkwast.se>
2022-01-18Allow sending commands after sending an unsubscribe (#1036)Bjorn Svensson
* Add test of async commands after unsubscribe Verify that commands are handled after unsubscribing from a channel. A command is sent before the `unsubscribe` response is received, which currently triggers an assert in async.c:567: `redisProcessCallbacks: Assertion `(c->flags & REDIS_SUBSCRIBED || c->flags & REDIS_MONITORING)' failed.` * Handle async commands after an unsubscribe When unsubscribing from the last channel we move from the `subscribe` state to a normal state. These states uses different holders for the command callback information. By moving the callback info during the state change the callback order can be maintained.
2022-01-11Correction for command timeout during pubsub (#1038)Bjorn Svensson
* Add test of command timeout during pubsub A timeout of a non-subscribe command will be ignored during pubsub. It will be handled as an idle timeout and a response is awaited for. * Correction for command timeout during pubsub Disconnect when a sent non-subscribe command triggers a timeout.
2022-01-08CMakeLists.txt: allow building without a C++ compiler (#872)Fabrice Fontaine
Define hiredis as a C project (and use a single PROJECT statement) to avoid the following build failure if a C++ compiler is not found: CMake Error at CMakeLists.txt:3 (PROJECT): The CMAKE_CXX_COMPILER: /srv/storage/autobuild/run/instance-1/output-1/host/bin/arm-linux-g++ is not a full path to an existing compiler tool. Tell CMake where to find the compiler by setting either the environment variable "CXX" or the CMake cache entry CMAKE_CXX_COMPILER to the full path to the compiler, or to the compiler name if it is in the PATH. The only cpp source file is examples/example-qt.cpp which is never compiled with cmake buildsystem. This file is compiled only with the Makefile buildsystem so perhaps it should be removed. If it is added to the cmake buildsystem, a call to enable_language(CXX) will have to be added. Fixes: - http://autobuild.buildroot.org/results/830ec3398cd29b9fc5cde06a225ef531d7a9d850 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2022-01-05Fix adapters/libevent.h compilation for 64-bit Windows (#937)Peter Tummillo
Where SOCKET is a 64-bit unsigned integer.
2021-12-24Don't link with crypto libs if USE_SSL isn't set.michael-grunder
2021-12-23Makefile: move SSL options into a block and refine ruleszhenwei pi
Move SSL options into two blocks to make it easy to read: 1, first part: SSL variables part 1, second part: SSL building rules part and change global rules to make it easy to maintain. For the further step, it gets extensible to add another type. New version of the library building rule: static: $(STLIBNAME) $(SSL_STLIB) dynamic: $(DYLIBNAME) $(SSL_DYLIB) Compare with the orignal version: dynamic: $(DYLIBNAME) static: $(STLIBNAME) ifeq ($(USE_SSL),1) dynamic: $(SSL_DYLIBNAME) static: $(SSL_STLIBNAME) endif If we want to add a new type(Ex, RDMA), for the new version, we can do like this: ########### RDMA variables start ############### ..... ########### RDMA variables end ############### static: $(STLIBNAME) $(SSL_STLIB) $(RDMA_STLIB) dynamic: $(DYLIBNAME) $(SSL_DYLIB) $(RDMA_DYLIB) ########### RDMA building rules start ############### ..... ########### RDMA building rules end ############### Signed-off-by: zhenwei pi <pizhenwei@bytedance.com>
2021-12-22Update CMakeLists.txt for more portability (#1005)Eric Deng
add alias hiredis::hiredis and hiredis::hiredis_static so when this project is FetchContent, it behave the same as find_package-ed. e.g. ``` find_package(hiredis 1.0.2 QUIET) if (NOT hiredis_FOUND) FetchContent_Declare( hiredis GIT_REPOSITORY https://github.com/redis/hiredis.git GIT_TAG v1.0.2 ) FetchContent_MakeAvailable(hiredis) endif () # later target_link_libraries(target **hiredis::hiredis**) #can always use hiredis::hiredis to ref to this project. no matter find_package or FetchContent ``` this is actually sort of best practice when making a CMake lib.
2021-12-22Fix integer overflow when format command larger than 4GB (#1030)sundb
2021-12-22Handle array response in parallell with pubsub using RESP3 (#1014)Bjorn Svensson
RESP3 allows sending commands in parallell with pubsub handling and these commands might get responded with a REDIS_REPLY_ARRAY. This conflicts with the pubsub response handling for RESP2 and results in a faulty state when using RESP3. Add functionality to keep track of PUSH/RESP3 support on the connection and only expect the message type REDIS_REPLY_PUSH as subscribe messages when once seen.
2021-12-16Support PING while subscribing (RESP2) (#1027)Bjorn Svensson
* Handle PING during pubsub in RESP2 * Rename invalid callback list Some commands are valid to send during a subscribe in RESP2, and most in RESP3. Renaming the callback list from `invalid` to `replies` to detail this fact. * Fix review comment
2021-12-16FreeBSD build fixes + CI (#1026)Michael Grunder
* BSD linkage fix proposal * Touch up the Makefile to fix BSD builds Fixes #984 * Add a build in FreeBSD to GitHub Actions Lots of people use hiredis in FreeBSD so this should reduce some pain moving forward. Co-authored-by: David Carlier <devnexen@gmail.com>
2021-12-16Merge branch 'redis:master' into mastersundb
2021-12-01Add asynchronous test for pubsub using RESP3 (#1012)Bjorn Svensson
* Include `unsubscribe` as a subscribe reply in RESP3 By providing the (p)unsubscribe message via the subscribe callback, instead of via the push callback, we get the same behavior in RESP3 as in RESP2. * Add asynchronous test for pubsub using RESP3 The testcase will subscribe to a channel, and via a second client a message is published to the channel. After receiving the message the testcase will unsubscribe and disconnect. This RESP3 testcase reuses the subscribe callback from the RESP2 testcase to make sure we have a common behavior.
2021-11-24Valgrind returns error exit code when errors found (#1011)Bjorn Svensson
By default Valgrind will return the exit code from the tested process. Since our test can return 0 (ALL TESTS PASS) even when a leak was found we need to tell Valgrind to return an error code. This will fail the CI job when issues are found.
2021-11-18Move to using make directly in Cygwin (#1020)Michael Grunder
CMake started hanging when trying to detect the C compiler ABI in cygin, so for now just build with make directly.
2021-11-18Correct CMake warning for libevent adapter exampleBjörn Svensson
2021-11-18Remove unused parameter warning in libev adapterBjörn Svensson
A warning in `redisLibevTimeout(..)` is triggered when building the libev adapter with Clang using -Wextra/-Wunused-parameter. Works fine with gcc..
2021-11-17Small tweaks of the async testsmichael-grunder
2021-11-01Fix potential fault at createDoubleObjectPei-Hsuan Hung
Resolves #963. Add additional check to `hi_malloc` for `r->str` when len equals to SIZE_MAX.
2021-10-27Add asynchronous test for pubsub using RESP2Björn Svensson
The testcase will subscribe to a channel, and via a second client a message is published to the channel. After receiving the message the testcase will unsubscribe and disconnect.
2021-10-26Add build options for enabling async testsBjörn Svensson
Asynchronous testcases that requires the event library `libevent` can be built and enabled by using the added build flags: - ENABLE_ASYNC_TESTS when using CMake - TEST_ASYNC when using Make The async tests are disabled by default to avoid adding new requirements, but the testcases are built and run in CI.
2021-10-21Correcting the build target `coverage` for enabled SSL (#1009)Bjorn Svensson
* Exclude includes from /usr in coverage reporting * Correct build target `coverage` for enabled ssl `USE_SSL=1 make coverage` will now build the test binary with the forwarded define HIREDIS_TEST_SSL. This avoids inconsistency between built test binary and the testrunner `test.sh`. This enables test coverage measurements for SSL too.
2021-10-20Run SSL tests in CIBjörn Svensson
2021-10-14Add valgrind and CMake to testsmichael-grunder
2021-10-12Add Centos8michael-grunder
I'm sure this can be done with a container matrix but figuring that out is left for another day.
2021-10-12We should run actions on PRsmichael-grunder
2021-10-12Add Cygwin build testmichael-grunder
2021-10-10Add Windows tests in GitHub actionsmichael-grunder
See: #992 TODO: MinGW/cygwin tests
2021-10-10Switch to GitHub actionsmichael-grunder
Since TravisCI.org was deprecated we've been without any tests. This commit adds back basic tests in Ubuntu, CentOS, and MacOS. More sophisticated tests/platforms to come in the future (e.g. 32bit tests). See: #992
2021-10-10Fix unused variable warning.michael-grunder
2021-10-10Minor refactor of CVE-2021-32765 fix.michael-grunder
Since `hi_calloc` always passes through one of our wrapper functions, we can perform this overflow in the wrapper, and get protection everywhere. Previous commit: 76a7b10005c70babee357a7d0f2becf28ec7ed1e Related vuln ID: CVE-2021-32765 [Full Details](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2)
2021-10-09Remove extra comma from cmake var.Tongliang Liao
Or it'll be treated as part of the var name.
2021-10-07Merge branch 'release/v1.0.2'michael-grunder
2021-10-07Prepare for v1.0.2 GAmichael-grunder
2021-10-07Revert erroneous SONAME bumpmichael-grunder
2021-10-04Merge branch 'release/v1.0.1'michael-grunder
Merge the v1.0.1 release branch and bump the dev version to 1.0.2-dev
2021-10-04 Prepare for v1.0.1 GAmichael-grunder
2021-10-04Fix for integer/buffer overflow CVE-2021-32765Yossi Gottlieb
This fix prevents hiredis from trying to allocate more than `SIZE_MAX` bytes, which would result in a buffer overrun. [Full Details](https://github.com/redis/hiredis/security/advisories/GHSA-hfm9-39pp-55p2)
2021-10-03Allow to override OPENSSL_PREFIX in LinuxYunier Perez
2021-08-18Don't leak memory if an invalid type is set (#906)rouzier
Co-authored-by: James Rouzier <jrouzier@inverse.ca>
2021-07-11Added REDIS_NO_AUTO_FREE_REPLIES flag (#962)Meir Shpilraien (Spielrein)
When set hiredis will not automatically free replies in an async context, and the replies must be freed instead by the user. Co-authored-by: Michael Grunder <michael.grunder@gmail.com>
2021-06-17Ensure we curry any connect error to an async context.michael-grunder
2021-05-23Fix README.mdmichael-grunder
Closes #929
2021-05-02Merge pull request #935 from kristjanvalur/pr5Michael Grunder
Bugfix: Ignore timeout callback from a successful connect (fixes #945)
2021-05-02Merge pull request #939 from zmartzone/improve_pr_896_ssl_leakMichael Grunder
improve SSL leak fix redis/hiredis#896
2021-05-02Merge pull request #949 from plan-do-break-fix/Typo-correctionsMichael Grunder
fix(docs): corrects typos in project README
2021-04-24fix(docs): corrects typos in project READMEplan-do-break-fix