redict/deps/hiredis/async.c

1035 lines
33 KiB
C
Raw Normal View History

/*
* Copyright (c) 2009-2011, Salvatore Sanfilippo <antirez at gmail dot com>
* Copyright (c) 2010-2011, Pieter Noordhuis <pcnoordhuis at gmail dot com>
*
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* * Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
* * Neither the name of Redis nor the names of its contributors may be used
* to endorse or promote products derived from this software without
* specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*/
#include "fmacros.h"
#include "alloc.h"
#include <stdlib.h>
#include <string.h>
#ifndef _MSC_VER
#include <strings.h>
#endif
#include <assert.h>
#include <ctype.h>
#include <errno.h>
#include "async.h"
#include "net.h"
#include "dict.c"
#include "sds.h"
#include "win32.h"
#include "async_private.h"
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
#ifdef NDEBUG
#undef assert
#define assert(e) (void)(e)
#endif
/* Forward declarations of hiredis.c functions */
int __redisAppendCommand(redisContext *c, const char *cmd, size_t len);
void __redisSetError(redisContext *c, int type, const char *str);
/* Functions managing dictionary of callbacks for pub/sub. */
static unsigned int callbackHash(const void *key) {
return dictGenHashFunction((const unsigned char *)key,
hi_sdslen((const hisds)key));
}
static void *callbackValDup(void *privdata, const void *src) {
((void) privdata);
redisCallback *dup;
dup = hi_malloc(sizeof(*dup));
if (dup == NULL)
return NULL;
memcpy(dup,src,sizeof(*dup));
return dup;
}
static int callbackKeyCompare(void *privdata, const void *key1, const void *key2) {
int l1, l2;
((void) privdata);
l1 = hi_sdslen((const hisds)key1);
l2 = hi_sdslen((const hisds)key2);
if (l1 != l2) return 0;
return memcmp(key1,key2,l1) == 0;
}
static void callbackKeyDestructor(void *privdata, void *key) {
((void) privdata);
hi_sdsfree((hisds)key);
}
static void callbackValDestructor(void *privdata, void *val) {
((void) privdata);
hi_free(val);
}
static dictType callbackDict = {
callbackHash,
NULL,
callbackValDup,
callbackKeyCompare,
callbackKeyDestructor,
callbackValDestructor
};
static redisAsyncContext *redisAsyncInitialize(redisContext *c) {
redisAsyncContext *ac;
dict *channels = NULL, *patterns = NULL;
channels = dictCreate(&callbackDict,NULL);
if (channels == NULL)
goto oom;
patterns = dictCreate(&callbackDict,NULL);
if (patterns == NULL)
goto oom;
ac = hi_realloc(c,sizeof(redisAsyncContext));
if (ac == NULL)
goto oom;
c = &(ac->c);
/* The regular connect functions will always set the flag REDIS_CONNECTED.
* For the async API, we want to wait until the first write event is
* received up before setting this flag, so reset it here. */
c->flags &= ~REDIS_CONNECTED;
ac->err = 0;
ac->errstr = NULL;
ac->data = NULL;
ac->dataCleanup = NULL;
ac->ev.data = NULL;
ac->ev.addRead = NULL;
ac->ev.delRead = NULL;
ac->ev.addWrite = NULL;
ac->ev.delWrite = NULL;
ac->ev.cleanup = NULL;
ac->ev.scheduleTimer = NULL;
ac->onConnect = NULL;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
ac->onConnectNC = NULL;
ac->onDisconnect = NULL;
ac->replies.head = NULL;
ac->replies.tail = NULL;
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
ac->sub.replies.head = NULL;
ac->sub.replies.tail = NULL;
ac->sub.channels = channels;
ac->sub.patterns = patterns;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
ac->sub.pending_unsubs = 0;
return ac;
oom:
if (channels) dictRelease(channels);
if (patterns) dictRelease(patterns);
return NULL;
}
/* We want the error field to be accessible directly instead of requiring
* an indirection to the redisContext struct. */
static void __redisAsyncCopyError(redisAsyncContext *ac) {
if (!ac)
return;
redisContext *c = &(ac->c);
ac->err = c->err;
ac->errstr = c->errstr;
}
redisAsyncContext *redisAsyncConnectWithOptions(const redisOptions *options) {
redisOptions myOptions = *options;
redisContext *c;
redisAsyncContext *ac;
/* Clear any erroneously set sync callback and flag that we don't want to
* use freeReplyObject by default. */
myOptions.push_cb = NULL;
myOptions.options |= REDIS_OPT_NO_PUSH_AUTOFREE;
myOptions.options |= REDIS_OPT_NONBLOCK;
c = redisConnectWithOptions(&myOptions);
if (c == NULL) {
return NULL;
}
ac = redisAsyncInitialize(c);
if (ac == NULL) {
redisFree(c);
return NULL;
}
/* Set any configured async push handler */
redisAsyncSetPushCallback(ac, myOptions.async_push_cb);
__redisAsyncCopyError(ac);
return ac;
}
redisAsyncContext *redisAsyncConnect(const char *ip, int port) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
return redisAsyncConnectWithOptions(&options);
}
redisAsyncContext *redisAsyncConnectBind(const char *ip, int port,
const char *source_addr) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
options.endpoint.tcp.source_addr = source_addr;
return redisAsyncConnectWithOptions(&options);
}
redisAsyncContext *redisAsyncConnectBindWithReuse(const char *ip, int port,
const char *source_addr) {
redisOptions options = {0};
REDIS_OPTIONS_SET_TCP(&options, ip, port);
options.options |= REDIS_OPT_REUSEADDR;
options.endpoint.tcp.source_addr = source_addr;
return redisAsyncConnectWithOptions(&options);
}
redisAsyncContext *redisAsyncConnectUnix(const char *path) {
redisOptions options = {0};
REDIS_OPTIONS_SET_UNIX(&options, path);
return redisAsyncConnectWithOptions(&options);
}
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
static int
redisAsyncSetConnectCallbackImpl(redisAsyncContext *ac, redisConnectCallback *fn,
redisConnectCallbackNC *fn_nc)
{
/* If either are already set, this is an error */
if (ac->onConnect || ac->onConnectNC)
return REDIS_ERR;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (fn) {
ac->onConnect = fn;
} else if (fn_nc) {
ac->onConnectNC = fn_nc;
}
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
/* The common way to detect an established connection is to wait for
* the first write event to be fired. This assumes the related event
* library functions are already set. */
_EL_ADD_WRITE(ac);
return REDIS_OK;
}
int redisAsyncSetConnectCallback(redisAsyncContext *ac, redisConnectCallback *fn) {
return redisAsyncSetConnectCallbackImpl(ac, fn, NULL);
}
int redisAsyncSetConnectCallbackNC(redisAsyncContext *ac, redisConnectCallbackNC *fn) {
return redisAsyncSetConnectCallbackImpl(ac, NULL, fn);
}
int redisAsyncSetDisconnectCallback(redisAsyncContext *ac, redisDisconnectCallback *fn) {
if (ac->onDisconnect == NULL) {
ac->onDisconnect = fn;
return REDIS_OK;
}
return REDIS_ERR;
}
/* Helper functions to push/shift callbacks */
static int __redisPushCallback(redisCallbackList *list, redisCallback *source) {
redisCallback *cb;
/* Copy callback from stack to heap */
cb = hi_malloc(sizeof(*cb));
if (cb == NULL)
return REDIS_ERR_OOM;
if (source != NULL) {
memcpy(cb,source,sizeof(*cb));
cb->next = NULL;
}
/* Store callback in list */
if (list->head == NULL)
list->head = cb;
if (list->tail != NULL)
list->tail->next = cb;
list->tail = cb;
return REDIS_OK;
}
static int __redisShiftCallback(redisCallbackList *list, redisCallback *target) {
redisCallback *cb = list->head;
if (cb != NULL) {
list->head = cb->next;
if (cb == list->tail)
list->tail = NULL;
/* Copy callback from heap to stack */
if (target != NULL)
memcpy(target,cb,sizeof(*cb));
hi_free(cb);
return REDIS_OK;
}
return REDIS_ERR;
}
static void __redisRunCallback(redisAsyncContext *ac, redisCallback *cb, redisReply *reply) {
redisContext *c = &(ac->c);
if (cb->fn != NULL) {
c->flags |= REDIS_IN_CALLBACK;
cb->fn(ac,reply,cb->privdata);
c->flags &= ~REDIS_IN_CALLBACK;
}
}
static void __redisRunPushCallback(redisAsyncContext *ac, redisReply *reply) {
if (ac->push_cb != NULL) {
ac->c.flags |= REDIS_IN_CALLBACK;
ac->push_cb(ac, reply);
ac->c.flags &= ~REDIS_IN_CALLBACK;
}
}
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
static void __redisRunConnectCallback(redisAsyncContext *ac, int status)
{
if (ac->onConnect == NULL && ac->onConnectNC == NULL)
return;
if (!(ac->c.flags & REDIS_IN_CALLBACK)) {
ac->c.flags |= REDIS_IN_CALLBACK;
if (ac->onConnect) {
ac->onConnect(ac, status);
} else {
ac->onConnectNC(ac, status);
}
ac->c.flags &= ~REDIS_IN_CALLBACK;
} else {
/* already in callback */
if (ac->onConnect) {
ac->onConnect(ac, status);
} else {
ac->onConnectNC(ac, status);
}
}
}
static void __redisRunDisconnectCallback(redisAsyncContext *ac, int status)
{
if (ac->onDisconnect) {
if (!(ac->c.flags & REDIS_IN_CALLBACK)) {
ac->c.flags |= REDIS_IN_CALLBACK;
ac->onDisconnect(ac, status);
ac->c.flags &= ~REDIS_IN_CALLBACK;
} else {
/* already in callback */
ac->onDisconnect(ac, status);
}
}
}
/* Helper function to free the context. */
static void __redisAsyncFree(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
redisCallback cb;
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
dictIterator it;
dictEntry *de;
/* Execute pending callbacks with NULL reply. */
while (__redisShiftCallback(&ac->replies,&cb) == REDIS_OK)
__redisRunCallback(ac,&cb,NULL);
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
while (__redisShiftCallback(&ac->sub.replies,&cb) == REDIS_OK)
__redisRunCallback(ac,&cb,NULL);
/* Run subscription callbacks with NULL reply */
if (ac->sub.channels) {
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
dictInitIterator(&it,ac->sub.channels);
while ((de = dictNext(&it)) != NULL)
__redisRunCallback(ac,dictGetEntryVal(de),NULL);
dictRelease(ac->sub.channels);
}
if (ac->sub.patterns) {
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
dictInitIterator(&it,ac->sub.patterns);
while ((de = dictNext(&it)) != NULL)
__redisRunCallback(ac,dictGetEntryVal(de),NULL);
dictRelease(ac->sub.patterns);
}
/* Signal event lib to clean up */
_EL_CLEANUP(ac);
/* Execute disconnect callback. When redisAsyncFree() initiated destroying
* this context, the status will always be REDIS_OK. */
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (c->flags & REDIS_CONNECTED) {
int status = ac->err == 0 ? REDIS_OK : REDIS_ERR;
if (c->flags & REDIS_FREEING)
status = REDIS_OK;
__redisRunDisconnectCallback(ac, status);
}
if (ac->dataCleanup) {
ac->dataCleanup(ac->data);
}
/* Cleanup self */
redisFree(c);
}
/* Free the async context. When this function is called from a callback,
* control needs to be returned to redisProcessCallbacks() before actual
* free'ing. To do so, a flag is set on the context which is picked up by
* redisProcessCallbacks(). Otherwise, the context is immediately free'd. */
void redisAsyncFree(redisAsyncContext *ac) {
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (ac == NULL)
return;
redisContext *c = &(ac->c);
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
c->flags |= REDIS_FREEING;
if (!(c->flags & REDIS_IN_CALLBACK))
__redisAsyncFree(ac);
}
/* Helper function to make the disconnect happen and clean up. */
void __redisAsyncDisconnect(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
/* Make sure error is accessible if there is any */
__redisAsyncCopyError(ac);
if (ac->err == 0) {
/* For clean disconnects, there should be no pending callbacks. */
int ret = __redisShiftCallback(&ac->replies,NULL);
assert(ret == REDIS_ERR);
} else {
/* Disconnection is caused by an error, make sure that pending
* callbacks cannot call new commands. */
c->flags |= REDIS_DISCONNECTING;
}
/* cleanup event library on disconnect.
* this is safe to call multiple times */
_EL_CLEANUP(ac);
/* For non-clean disconnects, __redisAsyncFree() will execute pending
* callbacks with a NULL-reply. */
if (!(c->flags & REDIS_NO_AUTO_FREE)) {
__redisAsyncFree(ac);
}
}
/* Tries to do a clean disconnect from Redis, meaning it stops new commands
* from being issued, but tries to flush the output buffer and execute
* callbacks for all remaining replies. When this function is called from a
* callback, there might be more replies and we can safely defer disconnecting
* to redisProcessCallbacks(). Otherwise, we can only disconnect immediately
* when there are no pending callbacks. */
void redisAsyncDisconnect(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
c->flags |= REDIS_DISCONNECTING;
/** unset the auto-free flag here, because disconnect undoes this */
c->flags &= ~REDIS_NO_AUTO_FREE;
if (!(c->flags & REDIS_IN_CALLBACK) && ac->replies.head == NULL)
__redisAsyncDisconnect(ac);
}
static int __redisGetSubscribeCallback(redisAsyncContext *ac, redisReply *reply, redisCallback *dstcb) {
redisContext *c = &(ac->c);
dict *callbacks;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
redisCallback *cb = NULL;
dictEntry *de;
int pvariant;
char *stype;
hisds sname = NULL;
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
/* Match reply with the expected format of a pushed message.
* The type and number of elements (3 to 4) are specified at:
* https://redis.io/topics/pubsub#format-of-pushed-messages */
if ((reply->type == REDIS_REPLY_ARRAY && !(c->flags & REDIS_SUPPORTS_PUSH) && reply->elements >= 3) ||
reply->type == REDIS_REPLY_PUSH) {
assert(reply->element[0]->type == REDIS_REPLY_STRING);
stype = reply->element[0]->str;
pvariant = (tolower(stype[0]) == 'p') ? 1 : 0;
if (pvariant)
callbacks = ac->sub.patterns;
else
callbacks = ac->sub.channels;
/* Locate the right callback */
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (reply->element[1]->type == REDIS_REPLY_STRING) {
sname = hi_sdsnewlen(reply->element[1]->str,reply->element[1]->len);
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (sname == NULL) goto oom;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if ((de = dictFind(callbacks,sname)) != NULL) {
cb = dictGetEntryVal(de);
memcpy(dstcb,cb,sizeof(*dstcb));
}
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
}
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
/* If this is an subscribe reply decrease pending counter. */
if (strcasecmp(stype+pvariant,"subscribe") == 0) {
assert(cb != NULL);
cb->pending_subs -= 1;
} else if (strcasecmp(stype+pvariant,"unsubscribe") == 0) {
if (cb == NULL)
ac->sub.pending_unsubs -= 1;
else if (cb->pending_subs == 0)
dictDelete(callbacks,sname);
/* If this was the last unsubscribe message, revert to
* non-subscribe mode. */
assert(reply->element[2]->type == REDIS_REPLY_INTEGER);
/* Unset subscribed flag only when no pipelined pending subscribe
* or pending unsubscribe replies. */
if (reply->element[2]->integer == 0
&& dictSize(ac->sub.channels) == 0
&& dictSize(ac->sub.patterns) == 0
&& ac->sub.pending_unsubs == 0) {
c->flags &= ~REDIS_SUBSCRIBED;
/* Move ongoing regular command callbacks. */
redisCallback cb;
while (__redisShiftCallback(&ac->sub.replies,&cb) == REDIS_OK) {
__redisPushCallback(&ac->replies,&cb);
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
}
}
}
hi_sdsfree(sname);
} else {
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
/* Shift callback for pending command in subscribed context. */
__redisShiftCallback(&ac->sub.replies,dstcb);
}
return REDIS_OK;
oom:
__redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
__redisAsyncCopyError(ac);
return REDIS_ERR;
}
#define redisIsSpontaneousPushReply(r) \
(redisIsPushReply(r) && !redisIsSubscribeReply(r))
static int redisIsSubscribeReply(redisReply *reply) {
char *str;
size_t len, off;
/* We will always have at least one string with the subscribe/message type */
if (reply->elements < 1 || reply->element[0]->type != REDIS_REPLY_STRING ||
reply->element[0]->len < sizeof("message") - 1)
{
return 0;
}
/* Get the string/len moving past 'p' if needed */
off = tolower(reply->element[0]->str[0]) == 'p';
str = reply->element[0]->str + off;
len = reply->element[0]->len - off;
return !strncasecmp(str, "subscribe", len) ||
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
!strncasecmp(str, "message", len) ||
!strncasecmp(str, "unsubscribe", len);
}
void redisProcessCallbacks(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
void *reply = NULL;
int status;
while((status = redisGetReply(c,&reply)) == REDIS_OK) {
if (reply == NULL) {
/* When the connection is being disconnected and there are
* no more replies, this is the cue to really disconnect. */
if (c->flags & REDIS_DISCONNECTING && hi_sdslen(c->obuf) == 0
&& ac->replies.head == NULL) {
__redisAsyncDisconnect(ac);
return;
}
/* When the connection is not being disconnected, simply stop
* trying to get replies and wait for the next loop tick. */
break;
}
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
/* Keep track of push message support for subscribe handling */
if (redisIsPushReply(reply)) c->flags |= REDIS_SUPPORTS_PUSH;
/* Send any non-subscribe related PUSH messages to our PUSH handler
* while allowing subscribe related PUSH messages to pass through.
* This allows existing code to be backward compatible and work in
* either RESP2 or RESP3 mode. */
if (redisIsSpontaneousPushReply(reply)) {
__redisRunPushCallback(ac, reply);
c->reader->fn->freeObject(reply);
continue;
}
/* Even if the context is subscribed, pending regular
* callbacks will get a reply before pub/sub messages arrive. */
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
redisCallback cb = {NULL, NULL, 0, 0, NULL};
if (__redisShiftCallback(&ac->replies,&cb) != REDIS_OK) {
/*
* A spontaneous reply in a not-subscribed context can be the error
* reply that is sent when a new connection exceeds the maximum
* number of allowed connections on the server side.
*
* This is seen as an error instead of a regular reply because the
* server closes the connection after sending it.
*
* To prevent the error from being overwritten by an EOF error the
* connection is closed here. See issue #43.
*
* Another possibility is that the server is loading its dataset.
* In this case we also want to close the connection, and have the
* user wait until the server is ready to take our request.
*/
if (((redisReply*)reply)->type == REDIS_REPLY_ERROR) {
c->err = REDIS_ERR_OTHER;
snprintf(c->errstr,sizeof(c->errstr),"%s",((redisReply*)reply)->str);
c->reader->fn->freeObject(reply);
__redisAsyncDisconnect(ac);
return;
}
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
/* No more regular callbacks and no errors, the context *must* be subscribed. */
assert(c->flags & REDIS_SUBSCRIBED);
if (c->flags & REDIS_SUBSCRIBED)
__redisGetSubscribeCallback(ac,reply,&cb);
}
if (cb.fn != NULL) {
__redisRunCallback(ac,&cb,reply);
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if (!(c->flags & REDIS_NO_AUTO_FREE_REPLIES)){
c->reader->fn->freeObject(reply);
}
/* Proceed with free'ing when redisAsyncFree() was called. */
if (c->flags & REDIS_FREEING) {
__redisAsyncFree(ac);
return;
}
} else {
/* No callback for this reply. This can either be a NULL callback,
* or there were no callbacks to begin with. Either way, don't
* abort with an error, but simply ignore it because the client
* doesn't know what the server will spit out over the wire. */
c->reader->fn->freeObject(reply);
}
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
/* If in monitor mode, repush the callback */
if (c->flags & REDIS_MONITORING) {
__redisPushCallback(&ac->replies,&cb);
}
}
/* Disconnect when there was an error reading the reply */
if (status != REDIS_OK)
__redisAsyncDisconnect(ac);
}
static void __redisAsyncHandleConnectFailure(redisAsyncContext *ac) {
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
__redisRunConnectCallback(ac, REDIS_ERR);
__redisAsyncDisconnect(ac);
}
/* Internal helper function to detect socket status the first time a read or
* write event fires. When connecting was not successful, the connect callback
* is called with a REDIS_ERR status and the context is free'd. */
static int __redisAsyncHandleConnect(redisAsyncContext *ac) {
int completed = 0;
redisContext *c = &(ac->c);
if (redisCheckConnectDone(c, &completed) == REDIS_ERR) {
/* Error! */
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if (redisCheckSocketError(c) == REDIS_ERR)
__redisAsyncCopyError(ac);
__redisAsyncHandleConnectFailure(ac);
return REDIS_ERR;
} else if (completed == 1) {
/* connected! */
if (c->connection_type == REDIS_CONN_TCP &&
redisSetTcpNoDelay(c) == REDIS_ERR) {
__redisAsyncHandleConnectFailure(ac);
return REDIS_ERR;
}
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
/* flag us as fully connect, but allow the callback
* to disconnect. For that reason, permit the function
* to delete the context here after callback return.
*/
c->flags |= REDIS_CONNECTED;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
__redisRunConnectCallback(ac, REDIS_OK);
if ((ac->c.flags & REDIS_DISCONNECTING)) {
redisAsyncDisconnect(ac);
return REDIS_ERR;
} else if ((ac->c.flags & REDIS_FREEING)) {
redisAsyncFree(ac);
return REDIS_ERR;
}
return REDIS_OK;
} else {
return REDIS_OK;
}
}
void redisAsyncRead(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
if (redisBufferRead(c) == REDIS_ERR) {
__redisAsyncDisconnect(ac);
} else {
/* Always re-schedule reads */
_EL_ADD_READ(ac);
redisProcessCallbacks(ac);
}
}
/* This function should be called when the socket is readable.
* It processes all replies that can be read and executes their callbacks.
*/
void redisAsyncHandleRead(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
/* must not be called from a callback */
assert(!(c->flags & REDIS_IN_CALLBACK));
if (!(c->flags & REDIS_CONNECTED)) {
/* Abort connect was not successful. */
if (__redisAsyncHandleConnect(ac) != REDIS_OK)
return;
/* Try again later when the context is still not connected. */
if (!(c->flags & REDIS_CONNECTED))
return;
}
c->funcs->async_read(ac);
}
void redisAsyncWrite(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
int done = 0;
if (redisBufferWrite(c,&done) == REDIS_ERR) {
__redisAsyncDisconnect(ac);
} else {
/* Continue writing when not done, stop writing otherwise */
if (!done)
_EL_ADD_WRITE(ac);
else
_EL_DEL_WRITE(ac);
/* Always schedule reads after writes */
_EL_ADD_READ(ac);
}
}
void redisAsyncHandleWrite(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
/* must not be called from a callback */
assert(!(c->flags & REDIS_IN_CALLBACK));
if (!(c->flags & REDIS_CONNECTED)) {
/* Abort connect was not successful. */
if (__redisAsyncHandleConnect(ac) != REDIS_OK)
return;
/* Try again later when the context is still not connected. */
if (!(c->flags & REDIS_CONNECTED))
return;
}
c->funcs->async_write(ac);
}
void redisAsyncHandleTimeout(redisAsyncContext *ac) {
redisContext *c = &(ac->c);
redisCallback cb;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
/* must not be called from a callback */
assert(!(c->flags & REDIS_IN_CALLBACK));
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if ((c->flags & REDIS_CONNECTED)) {
if (ac->replies.head == NULL && ac->sub.replies.head == NULL) {
/* Nothing to do - just an idle timeout */
return;
}
if (!ac->c.command_timeout ||
(!ac->c.command_timeout->tv_sec && !ac->c.command_timeout->tv_usec)) {
/* A belated connect timeout arriving, ignore */
return;
}
}
if (!c->err) {
__redisSetError(c, REDIS_ERR_TIMEOUT, "Timeout");
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
__redisAsyncCopyError(ac);
}
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (!(c->flags & REDIS_CONNECTED)) {
__redisRunConnectCallback(ac, REDIS_ERR);
}
while (__redisShiftCallback(&ac->replies, &cb) == REDIS_OK) {
__redisRunCallback(ac, &cb, NULL);
}
/**
* TODO: Don't automatically sever the connection,
* rather, allow to ignore <x> responses before the queue is clear
*/
__redisAsyncDisconnect(ac);
}
/* Sets a pointer to the first argument and its length starting at p. Returns
* the number of bytes to skip to get to the following argument. */
static const char *nextArgument(const char *start, const char **str, size_t *len) {
const char *p = start;
if (p[0] != '$') {
p = strchr(p,'$');
if (p == NULL) return NULL;
}
*len = (int)strtol(p+1,NULL,10);
p = strchr(p,'\r');
assert(p);
*str = p+2;
return p+2+(*len)+2;
}
/* Helper function for the redisAsyncCommand* family of functions. Writes a
* formatted command to the output buffer and registers the provided callback
* function with the context. */
static int __redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
redisContext *c = &(ac->c);
redisCallback cb;
struct dict *cbdict;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
dictIterator it;
dictEntry *de;
redisCallback *existcb;
int pvariant, hasnext;
const char *cstr, *astr;
size_t clen, alen;
const char *p;
hisds sname;
int ret;
/* Don't accept new commands when the connection is about to be closed. */
if (c->flags & (REDIS_DISCONNECTING | REDIS_FREEING)) return REDIS_ERR;
/* Setup callback */
cb.fn = fn;
cb.privdata = privdata;
cb.pending_subs = 1;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
cb.unsubscribe_sent = 0;
/* Find out which command will be appended. */
p = nextArgument(cmd,&cstr,&clen);
assert(p != NULL);
hasnext = (p[0] == '$');
pvariant = (tolower(cstr[0]) == 'p') ? 1 : 0;
cstr += pvariant;
clen -= pvariant;
if (hasnext && strncasecmp(cstr,"subscribe\r\n",11) == 0) {
c->flags |= REDIS_SUBSCRIBED;
/* Add every channel/pattern to the list of subscription callbacks. */
while ((p = nextArgument(p,&astr,&alen)) != NULL) {
sname = hi_sdsnewlen(astr,alen);
if (sname == NULL)
goto oom;
if (pvariant)
cbdict = ac->sub.patterns;
else
cbdict = ac->sub.channels;
de = dictFind(cbdict,sname);
if (de != NULL) {
existcb = dictGetEntryVal(de);
cb.pending_subs = existcb->pending_subs + 1;
}
ret = dictReplace(cbdict,sname,&cb);
if (ret == 0) hi_sdsfree(sname);
}
} else if (strncasecmp(cstr,"unsubscribe\r\n",13) == 0) {
/* It is only useful to call (P)UNSUBSCRIBE when the context is
* subscribed to one or more channels or patterns. */
if (!(c->flags & REDIS_SUBSCRIBED)) return REDIS_ERR;
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (pvariant)
cbdict = ac->sub.patterns;
else
cbdict = ac->sub.channels;
if (hasnext) {
/* Send an unsubscribe with specific channels/patterns.
* Bookkeeping the number of expected replies */
while ((p = nextArgument(p,&astr,&alen)) != NULL) {
sname = hi_sdsnewlen(astr,alen);
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
if (sname == NULL)
goto oom;
de = dictFind(cbdict,sname);
if (de != NULL) {
existcb = dictGetEntryVal(de);
if (existcb->unsubscribe_sent == 0)
existcb->unsubscribe_sent = 1;
else
/* Already sent, reply to be ignored */
ac->sub.pending_unsubs += 1;
} else {
/* Not subscribed to, reply to be ignored */
ac->sub.pending_unsubs += 1;
}
hi_sdsfree(sname);
Squashed 'deps/hiredis/' changes from f8de9a4bd..b6a052fe0 b6a052fe0 Helper for setting TCP_USER_TIMEOUT socket option (#1188) 3fa9b6944 Add RedisModule adapter (#1182) d13c091e9 Fix wincrypt symbols conflict 5d84c8cfd Add a test ensuring we don't clobber connection error. 3f95fcdae Don't attempt to set a timeout if we are in an error state. aacb84b8d Fix typo in makefile. 563b062e3 Accept -nan per the RESP3 spec recommendation. 04c1b5b02 Fix colliding option values 4ca8e73f6 Rework searching for openssl cd208812f Attempt to find the correct path for openssl. 011f7093c Allow specifying the keepalive interval e9243d4f7 Cmake static or shared (#1160) 1cbd5bc76 Write a version file for the CMake package (#1165) 6f5bae8c6 fix typo acd09461d CMakeLists.txt: respect BUILD_SHARED_LIBS 97fcf0fd1 Add sdevent adapter ccff093bc Bump dev version for the next release cycle. c14775b4e Prepare for v1.1.0 GA f0bdf8405 Add support for nan in RESP3 double (#1133) 991b0b0b3 Add an example that calls redisCommandArgv (#1140) a36686f84 CI updates (#1139) 8ad4985e9 fix flag reference 7583ebb1b Make freeing a NULL redisAsyncContext a no op. 2c53dea7f Update version in dev branch. f063370ed Prepare for v1.1.0-rc1 2b069573a CI fixes in preparation of release e1e9eb40d Add author information to release-drafter template. afc29ee1a Update for mingw cross compile ceb8a8815 fixed cpp build error with adapters/libhv.h 3b15a04b5 Fixup of PR734: Coverage of hiredis.c (#1124) c245df9fb CMake corrections for building on Windows (#1122) 9c338a598 Fix PUSH handler tests for Redis >= 7.0.5 6d5c3ee74 Install on windows fixes (#1117) 68b29e1ad Add timeout support to libhv adapter. (#1109) 722e3409c Additional include directory given by pkg-config (#1118) bd9ccb8c4 Use __attribute__ when building with clang on windows 5392adc26 set default SSL certificate directory 560e66486 Minor refactor d756f68a5 Add libhv example to our standard Makefile a66916719 Add adapters/libhv 855b48a81 Fix pkgconfig for hiredis_ssl 79ae5ffc6 Fix protocol error (#1106) 61b5b299f Use a windows specific keepalive function. (#1104) fce8abc1c Introduce .close method for redisContextFuncs cfb6ca881 Add REDIS_OPT_PREFER_UNSPEC (#1101) cc7c35ce6 Update documentation to explain redisConnectWithOptions. bc8d837b7 fix heap-buffer-overflow (#957) ca4a0e850 uvadapter: reduce number of uv_poll_start calls 35d398c90 Fix cmake config path on Linux. CMake config files were installed to `/usr/local/share/hiredis`, which is not recognizable by `find_package()`. I'm not sure why it was set that way. Given the commit introducing it is for Windows, I keep that behavior consistent there, but fix the rest. 10c78c6e1 Add possibility to prefer IPv6, IPv4 or unspecified 1abe0c828 fuzzer: No alloc in redisFormatCommand() when fail 329eaf9ba Fix heap-buffer-overflow issue in redisvFormatCommad eaae7321c Polling adapter requires sockcompat.h 0a5fa3dde Regression test for off-by-one parsing error 9e174e8f7 Add do while(0) protection for macros 4ad99c69a Rework asSleep to be a generic millisleep function. 75cb6c1ea Do store command timeout in the context for redisSetTimeout (#593) c57cad658 CMake: remove dict.c form hiredis_sources 8491a65a9 Add Github Actions CI workflow for hiredis: Arm, Arm64, 386, windows. (#943) 77e4f09ea Merge pull request #964 from afcidk/fix-createDoubleObject 9219f7e7c Merge pull request #901 from devnexen/illumos_test_fix 810cc6104 Merge pull request #905 from sundb/master df8b74d69 Merge pull request #1091 from redis/ssl-error-ub-fix 0ed6cdec3 Fix some undefined behaviour 507a6dcaa Merge pull request #1090 from Nordix/subscribe-oom-error b044eaa6a Copy error to redisAsyncContext when finding subscribe cb e0200b797 Merge pull request #1087 from redis/const-and-non-const-callback 6a3e96ad2 Maintain backward compatibiliy withour onConnect callback. e7afd998f Merge pull request #1079 from SukkaW/drop-macos-10.15-runner 17c8fe079 Merge pull request #931 from kristjanvalur/pr2 b808c0c20 Merge pull request #1083 from chayim/ck-drafter 367a82bf0 Merge pull request #1085 from stanhu/ssl-improve-options-setting 71119a71d Make it possible to set SSL verify mode dd7979ac1 Merge pull request #1084 from stanhu/sh-improve-ssl-docs c71116178 Improve example for SSL initialization in README.md 5c9b6b571 Release drafter a606ccf2a CI: use recommended `vmactions/freebsd-vm@v0` 0865c115b Merge pull request #1080 from Nordix/readme-corrections f6cee7142 Fix README typos 06be7ff31 Merge pull request #1050 from smmir-cent/fix-cmake-version 7dd833d54 CI: bump macos runner version f69fac769 Drop `const` on redisAsyncContext in redisConnectCallback Since the callback is now re-entrant, it can call apis such as redisAsyncDisconnect() 005d7edeb Support calling redisAsyncDisconnect from the onConnected callback, by deferring context deletion 6ed060920 Add async regression test for issue #931 eaa2a7ee7 Merge pull request #932 from kristjanvalur/pr3 2ccef30f3 Add regression test for issue #945 4b901d44a Initial async tests 31c91408e Polling adapter and example 8a15f4d65 Merge pull request #1057 from orgads/static-name 902dd047f Merge pull request #1054 from kristjanvalur/pr08 c78d0926b Merge pull request #1074 from michael-grunder/kristjanvalur-pr4 2b115d56c Whitespace 1343988ce Fix typos 47b57aa24 Add some documentation on connect/disconnect callbacks and command callbacks a890d9ce2 Merge pull request #1073 from michael-grunder/kristjanvalur-pr1 f246ee433 Whitespace, style 94c1985bd Use correct type for getsockopt() 5e002bc21 Support failed async connects on windows. 5d68ad2f4 Merge pull request #1072 from michael-grunder/fix-redis7-unit-tests f4b6ed289 Fix tests so they work for Redis 7.0 95a0c1283 Merge pull request #1058 from orgads/win64 eedb37a65 Fix warnings on Win64 47c3ecefc Merge pull request #1062 from yossigo/fix-push-notification-order e23d91c97 Merge pull request #1061 from yossigo/update-redis-apt 34211ad54 Merge pull request #1063 from redis/fix-windows-tests 9957af7e3 Whitelist hiredis repo path in cygwin b455b3381 Handle push notifications before or after reply. aed9ce446 Use official repository for redis package. d7683f35a Merge pull request #1047 from Nordix/unsubscribe-handling 7c44a9d7e Merge pull request #1045 from Nordix/sds-updates dd4bf9783 Use the same name for static and shared libraries ff57c18b9 Embed debug information in windows static lib, rather than create a .pdb file 8310ad4f5 fix cmake version 7123b87f6 Handle any pipelined unsubscribe in async b6fb548fc Ignore pubsub replies without a channel/pattern 00b82683b Handle overflows as errors instead of asserting 64062a1d4 Catch size_t overflows in sds.c 066c6de79 Use size_t/long to avoid truncation c6657ef65 Merge branch 'redis:master' into master 50cdcab49 Fix potential fault at createDoubleObject fd033e983 Remove semicolon after do-while in _EL_CLEANUP 664c415e7 Illumos test fixes, error message difference fot bad hostname test. git-subtree-dir: deps/hiredis git-subtree-split: b6a052fe0959dae69e16b9d74449faeb1b70dbe1
2023-05-30 15:23:45 -04:00
}
} else {
/* Send an unsubscribe without specific channels/patterns.
* Bookkeeping the number of expected replies */
int no_subs = 1;
dictInitIterator(&it,cbdict);
while ((de = dictNext(&it)) != NULL) {
existcb = dictGetEntryVal(de);
if (existcb->unsubscribe_sent == 0) {
existcb->unsubscribe_sent = 1;
no_subs = 0;
}
}
/* Unsubscribing to all channels/patterns, where none is
* subscribed to, results in a single reply to be ignored. */
if (no_subs == 1)
ac->sub.pending_unsubs += 1;
}
/* (P)UNSUBSCRIBE does not have its own response: every channel or
* pattern that is unsubscribed will receive a message. This means we
* should not append a callback function for this command. */
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
} else if (strncasecmp(cstr,"monitor\r\n",9) == 0) {
/* Set monitor flag and push callback */
c->flags |= REDIS_MONITORING;
if (__redisPushCallback(&ac->replies,&cb) != REDIS_OK)
goto oom;
} else {
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
if (c->flags & REDIS_SUBSCRIBED) {
if (__redisPushCallback(&ac->sub.replies,&cb) != REDIS_OK)
goto oom;
} else {
if (__redisPushCallback(&ac->replies,&cb) != REDIS_OK)
goto oom;
}
}
__redisAppendCommand(c,cmd,len);
/* Always schedule a write when the write buffer is non-empty */
_EL_ADD_WRITE(ac);
return REDIS_OK;
oom:
__redisSetError(&(ac->c), REDIS_ERR_OOM, "Out of memory");
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
__redisAsyncCopyError(ac);
return REDIS_ERR;
}
int redisvAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, va_list ap) {
char *cmd;
int len;
int status;
len = redisvFormatCommand(&cmd,format,ap);
/* We don't want to pass -1 or -2 to future functions as a length. */
if (len < 0)
return REDIS_ERR;
status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
hi_free(cmd);
return status;
}
int redisAsyncCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *format, ...) {
va_list ap;
int status;
va_start(ap,format);
status = redisvAsyncCommand(ac,fn,privdata,format,ap);
va_end(ap);
return status;
}
int redisAsyncCommandArgv(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, int argc, const char **argv, const size_t *argvlen) {
hisds cmd;
Squashed 'deps/hiredis/' changes from 00272d669..f8de9a4bd f8de9a4bd Merge pull request #1046 from redis/rockylinux-ci a41c9bc8b CentOS 8 is EOL, switch to RockyLinux be41ed60d Avoid incorrect call to the previous reply's callback (#1040) f2e8010d9 fix building on AIX and SunOS (#1031) e73ab2f23 Add timeout support for libuv adapter (#1016) f2ce5980e Allow sending commands after sending an unsubscribe (#1036) ff860e55d Correction for command timeout during pubsub (#1038) 24d534493 CMakeLists.txt: allow building without a C++ compiler (#872) 4ece9a02e Fix adapters/libevent.h compilation for 64-bit Windows (#937) 799edfaad Don't link with crypto libs if USE_SSL isn't set. f74b08182 Makefile: move SSL options into a block and refine rules f347743b7 Update CMakeLists.txt for more portability (#1005) f2be74802 Fix integer overflow when format command larger than 4GB (#1030) 58aacdac6 Handle array response in parallell with pubsub using RESP3 (#1014) d3384260e Support PING while subscribing (RESP2) (#1027) e3a479e40 FreeBSD build fixes + CI (#1026) da5a4ff36 Add asynchronous test for pubsub using RESP3 (#1012) b5716ee82 Valgrind returns error exit code when errors found (#1011) 1aed21a8c Move to using make directly in Cygwin (#1020) a83f4b890 Correct CMake warning for libevent adapter example c4333203e Remove unused parameter warning in libev adapter 7ad38dc4a Small tweaks of the async tests 4021726a6 Add asynchronous test for pubsub using RESP2 648763c36 Add build options for enabling async tests c98c6994d Correcting the build target `coverage` for enabled SSL (#1009) 30ff8d850 Run SSL tests in CI 4a126e8a9 Add valgrind and CMake to tests b73c2d410 Add Centos8 e9f647384 We should run actions on PRs 6ad4ccf3c Add Cygwin build test 783a3789c Add Windows tests in GitHub actions 0cac8dae1 Switch to GitHub actions fa900ef76 Fix unused variable warning. e489846b7 Minor refactor of CVE-2021-32765 fix. 51c740824 Remove extra comma from cmake var. Or it'll be treated as part of the var name. 632bf0718 Merge branch 'release/v1.0.2' b73128324 Prepare for v1.0.2 GA d4e6f109a Revert erroneous SONAME bump a39824a5d Merge branch 'release/v1.0.1' 8d1bfac46 Prepare for v1.0.1 GA 76a7b1000 Fix for integer/buffer overflow CVE-2021-32765 9eca1f36f Allow to override OPENSSL_PREFIX in Linux 2d9d77518 Don't leak memory if an invalid type is set (#906) f5f31ff9b Added REDIS_NO_AUTO_FREE_REPLIES flag (#962) 5850a8ecd Ensure we curry any connect error to an async context. b6f86f38c Fix README.md 667dbf536 Merge pull request #935 from kristjanvalur/pr5 9bf6c250e Merge pull request #939 from zmartzone/improve_pr_896_ssl_leak 959af9760 Merge pull request #949 from plan-do-break-fix/Typo-corrections 0743f57bb fix(docs): corrects typos in project README 5f4382247 improve SSL leak fix redis/hiredis#896 e06ecf7e4 Ignore timeout callback from a successful connect dfa33e60b Change order independant push logic to not change behavior. 6204182aa Handle the case where an invalidation is sent second. d6a0b192b Merge branch 'reader-updates' 410c24d2a Fix off-by-one error in seekNewline bd7488d27 read: Validate line items prior to checking for object creation callbacks 5f9242a1f read: Remove obsolete comment on nested multi bulk depth limitation 83c145042 read: Add support for the RESP3 bignum type c6646cb19 read: Ensure no invalid '\r' or '\n' in simple status/error strings e43061156 read: Additional validation and test case for RESP3 double c8adea402 redisReply: Fix parent type assertions during double, nil, bool creation ff73f1f9e redisReply: Explicitly list nil and bool cases in freeReplyObject() switch. 0f9251884 test: Add test case for RESP3 set 33c06dd50 test: Add test case for RESP3 map 397fe2630 read: Use memchr() in seekNewline() instead of looping over entire string 81c48a982 test: Add test cases for RESP3 bool 51e693f4f read: Add additional RESP3 bool validation 790b4d3b4 test: Add test cases for RESP3 nil d8899fbc1 read: Add additional RESP3 nil validation 96e8ea611 test: Add test cases for infinite and NaN doubles f913e9b99 read: Fix double validation and infinity parsing 8039c7d26 test: Add test case for doubles 49539fd1a redisReply: Fix - set len in double objects 53a8144c8 Merge pull request #924 from cheese1/master 9390de006 http -> https 7d99b5635 Merge pull request #917 from Nordix/stack-alloc-dict-iter 4bba72103 Handle OOM during async command callback registration 920128a26 Stack allocate dict iterators 297ecbecb Tiny formatting changes + suppress implicit memcpy warning f746a28e7 Removed 2 typecasts 940a04f4d Added fuzzer e4a200040 Merge pull request #896 from ayeganov/bugfix/ssl_leak aefef8987 Free SSL object when redisSSLConnect fails e3f88ebcf Merge pull request #894 from jcohen02/fix/issue893 308ffcab8 Updating SSL connection example 297f6551d Merge pull request #889 from redis/wincert e7dda9785 Formatting f44945a0a Merge pull request #874 from masariello/position-independent-code 74e78498c Merge pull request #888 from michael-grunder/nil-push-invalidation b9b9f446f Fix handling of NIL invalidation messages. acc917548 Merge pull request #885 from gkorland/patch-1 b086f763e clean a warning, remvoe empty else block b47fae4e7 Merge pull request #881 from timgates42/bugfix_typo_terminated f989670e5 docs: Fix simple typo, termined -> terminated 773d6ea8a Copy error to redisAsyncContext on timeout e35300a66 add pdb files to packages for MSVC builds dde6916b4 Add d suffix to debug libraries so that can packaged together with optimized builds (Release, RelWithDebInfo, etc) 3b68b5018 Enable position-independent code 6693863f4 Add support for system CA certificate store on Windows 2a5a57b90 Remove whitespace 1b40ec509 fixed issue with unit test linking on windows with SSL d7b1d21e8 Merge branch 'master' of github.com:redis/hiredis fb0e6c0dd Merge pull request #870 from michael-grunder/cmake-c99 13a35bdb6 Explicitly set c99 in CMake bea137ca9 Merge pull request #868 from michael-grunder/fix-sockaddr-typo bd6f86eb6 Fix sockaddr typo 48696e7e5 Don't use non-installed win32.h helper in examples (#863) faa1c4863 Merge tag 'v1.0.0' 5003906d6 Define a no op assert if we detect NDEBUG (#861) ea063b7cc Use development specific versions in master 04a27f480 We can run SSL tests everywhere except mingw/Windows (#859) 8966a1fc2 Remove extra whitespace (#858) 34b7f7a0f Keep libev's code style (#857) 07c3618ff Add static library target and cpack support REVERT: 00272d669 Rename sds calls so they don't conflict in Redis. git-subtree-dir: deps/hiredis git-subtree-split: f8de9a4bd433791890572f7b9147e685653ddef9
2022-02-14 06:51:42 -05:00
long long len;
int status;
len = redisFormatSdsCommandArgv(&cmd,argc,argv,argvlen);
if (len < 0)
return REDIS_ERR;
status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
hi_sdsfree(cmd);
return status;
}
int redisAsyncFormattedCommand(redisAsyncContext *ac, redisCallbackFn *fn, void *privdata, const char *cmd, size_t len) {
int status = __redisAsyncCommand(ac,fn,privdata,cmd,len);
return status;
}
redisAsyncPushFn *redisAsyncSetPushCallback(redisAsyncContext *ac, redisAsyncPushFn *fn) {
redisAsyncPushFn *old = ac->push_cb;
ac->push_cb = fn;
return old;
}
int redisAsyncSetTimeout(redisAsyncContext *ac, struct timeval tv) {
if (!ac->c.command_timeout) {
ac->c.command_timeout = hi_calloc(1, sizeof(tv));
if (ac->c.command_timeout == NULL) {
__redisSetError(&ac->c, REDIS_ERR_OOM, "Out of memory");
__redisAsyncCopyError(ac);
return REDIS_ERR;
}
}
if (tv.tv_sec != ac->c.command_timeout->tv_sec ||
tv.tv_usec != ac->c.command_timeout->tv_usec)
{
*ac->c.command_timeout = tv;
}
return REDIS_OK;
}