summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-28Update libevent.hzfz
event_del can not free the "e->rev" and "e->wev",that will leak when reconnect the redis
2017-03-22Merge pull request #513 from i110/masterJan-Erik Rediger
suppress gcc complaint
2017-03-22suppress gcc complaintIchito Nagata
2017-01-23Merge pull request #499 from jinq0123/fixbug/redisSetErrorFromErrnoJan-Erik Rediger
Fix __redisSetErrorFromErrno() can not get error string.
2016-12-30Fix __redisSetErrorFromErrno() can not get error string.Jin Qing
snprintf() may change errno.
2016-12-09Auto merge of #429 - xinchuantao:master, r=badboynot-a-robot
using new version libevent
2016-12-09Auto merge of #468 - paul-scott:master, r=badboynot-a-robot
Prevented uv adapter from calling write when context has been freed The `redisLibuvPoll` function can be called with both the `UV_READABLE` and `UV_WRITABLE` flags set at the same time. Calling `redisAsyncHandleRead` can lead to a disconnect and the context being cleaned up/freed. If this happens then `redisAsyncHandleWrite` should not be called otherwise memory read/write errors and duplicate freeing will occur. These changes prevent this from happening by having the `redisLibuvCleanup` callback indicate that the context has been cleaned. This is done indirectly by setting the context to a null pointer, maybe someone can come up with a cleaner way.
2016-12-09Avoid unchecked mallocJan-Erik Rediger
Closes #471
2016-11-04Merge pull request #479 from DonaldWhyte/patch-1Jan-Erik Rediger
Remove trailing comma in redisConnectionType enum
2016-10-25Remove trailing comma in redisConnectionType enumDonald Whyte
Remove trailing comma in last value of `redisConnectionType` enum. This causes a compiler warning on Solaris compilers. I'd like to build this on Solaris with `-Werror`. However, due to the trailing comma, I cannot do that. This PR removes the trailing comma, which should prevent it causing compiler warnings on any architecture.
2016-09-19Prevented uv adapter from calling write when context has been freedPaul Scott
2016-07-09Auto merge of #445 - xxvv:master, r=badboynot-a-robot
fix: should close socket fd when retry connect (tcp)
2016-07-07fix: should close socket fd when retry connet remote (tcp)WSL
2016-06-20Auto merge of #440 - redis:pr-438, r=badboynot-a-robot
Test on OSX Thanks to @tnm & @xor-gate
2016-06-20Auto merge of #428 - avatli:patch-1, r=badboynot-a-robot
Update sds.h Fixing sds.h for building hiredis in cpp project
2016-06-20Auto merge of #439 - tnm:fmacros-fix, r=badboynot-a-robot
Do not define _XOPEN_SOURCE for OS X redis@bb1747b appears to have introduced a build regression for OS X (and possibly elsewhere, I've only tested on a local Mac environment) — in master right now `make` reliably fails on OS X as reported in redis#431. There looks to be another PR to fix the issue in redis#433. This PR here simply returns to the previous behavior on OS X in a minimally-invasive way. There are of course a few different ways to do this with the directives; feel free to do something different, I just care that master can build on OS X 🙇
2016-06-20chore(CI): Exclude valgrind jobs on OSXJan-Erik Rediger
2016-06-19Do not define _XOPEN_SOURCE for OS XTed Nyman
Resolves failed `make` on OS X.
2016-06-19Add a before_script for the OS X environmentTed Nyman
2016-06-19Test on Travis for both linux and osxTed Nyman
2016-05-20using new version libeventChris.Xin
2016-05-14Update sds.hAli Volkan ATLI
Fixing sds.h for building hiredis in cpp project
2016-05-14Auto merge of #427 - redis:pr-426, r=badboynot-a-robot
Pr 426 Closes #426, now with test
2016-05-14test: Add regression test for sds argv formattingJan-Erik Rediger
2016-05-14Typo format in redisFormatSdsCommandArgv functionPaulino Huerta
this issue is very significant, because not allow the proper execution of the "function redisCommandArgv". The server returns "invalid bulk length". Thanks!
2016-05-12Auto merge of #378 - thomaslee:tom_fix_kfreebsd, r=badboynot-a-robot
Fix strerror_r on some esoteric platforms Defining _XOPEN_SOURCE=1 causes strange behavior on Debian kfreebsd archs -- i.e. the GNU userspace with FreeBSD kernel -- when _GNU_SOURCE is not defined (the default). Not sure I fully understand the bizarre semantics, but it seems to use the XSI-compliant interface (int strerror_r(int, char*, size_t)) but the GNU implementation (char *strerror_r(int, char*, size_t)) such that strerror_r returns 32-bits of a 64-bit char * on x86_64 kfreebsd. We would expect strerror_r to return zero when using the XSI-compliant strerror_r implementation or a 64-bit char* when using the GNU version. Instead, we get something in between! Unless I'm missing something, being more explicit about what version of _XOPEN_SOURCE we want seems to be the prudent thing to do here -- and if folks want the GNU implementation of strerror_r for some reason they can always -D_GNU_SOURCE explicitly.
2016-04-20Auto merge of #418 - redis:debug-flags, r=badboynot-a-robot
fix: Rename DEBUG to DEBUG_FLAGS This avoids issues with environments where DEBUG is set to an arbitrary value to force debug mode in other tools. BREAKING CHANGE: This breaks builds that explicitely set `DEBUG` to some value (even the empty value). To get back the old behaviour change the `DEBUG_FLAGS` variable now. Cloes #381
2016-04-20docs: Add breaking change note about makefile variableJan-Erik Rediger
2016-04-20fix: Rename DEBUG to DEBUG_FLAGSJan-Erik Rediger
This avoids issues with environments where DEBUG is set to an arbitrary value to force debug mode in other tools. BREAKING CHANGE: This breaks builds that explicitely set `DEBUG` to some value (even the empty value). To get back the old behaviour change the `DEBUG_FLAGS` variable now.
2016-04-20Auto merge of #417 - redis:thread-safety, r=badboynot-a-robot
docs: Note about thread-safety
2016-04-20Auto merge of #416 - redis:string-len-size_t, r=badboynot-a-robot
fix: Change string length type to size_t
2016-04-20Auto merge of #415 - redis:new-readme, r=badboynot-a-robot
docs: Add changelog for upcoming version and note about status of README
2016-04-20docs: Note about thread-safetyJan-Erik Rediger
2016-04-20Auto merge of #379 - thomaslee:tom_test_race, r=badboynot-a-robot
Fix potential race in 'invalid timeout' tests It's possible for the call to connect() to succeed on the very first try, in which case the logic for checking for invalid timeout fields is never executed. When this happens, the tests fail because they expect a REDIS_ERR_IO but no such failure has occurred. Tests aside, this is a potential source of irritating and hard-to-find intermittent bugs. This patch forces the validation to occur early so that we get predictable behavior whenever an invalid timeout is specified.
2016-04-20Auto merge of #406 - DongwenHuang:patch-1, r=badboynot-a-robot
Update read.c static char *seekNewline(char *s, size_t len) : this function can not parse the string,such as "hello world\r". the case that the last char is '\r'.
2016-04-20Auto merge of #413 - charsyam:feature/remove-unused-code, r=badboynot-a-robot
remove unnecessory code remove some unnecessory code. It is not used any other parts
2016-04-20docs: Add changelog for upcoming version and note about status of READMEJan-Erik Rediger
[ci-skip]
2016-04-20fix: Change string length type to size_tJan-Erik Rediger
2016-04-20Auto merge of #411 - redis:backwards-compatibility-macros, r=badboynot-a-robot
fix: Remove backwards compatibility macro's Closes #296 BREAKING CHANGE: This removes the redisReplyReader* functions, which are already replaced by redisReader* functions. It renames `redisReplyReaderSetPrivdata`, `redisReplyReaderGetObject` and `redisReplyReaderGetError` to `redisReaderSetPrivdata`, `redisReaderGetObject` and `redisReaderGetError`.
2016-04-20remove unnessory codecharsyam
2016-04-20Auto merge of #414 - redis:fix-cygwin, r=badboynot-a-robot
Fix cygwin
2016-04-20Auto merge of #410 - redis:updated-sds, r=badboynot-a-robot
Updated sds
2016-04-20remove unused codecharsyam
2016-04-20chore: Cleanup appveyor configurationJan-Erik Rediger
2016-04-20remove werror in cygwinowent
2016-04-20Add CI for Windowsowent
- fix macro problem in mingw-gcc - fix typedef in cygwin
2016-04-20Auto merge of #407 - xor-gate:fix-wundef-warning, r=badboynot-a-robot
fmacros.h: Fix warning when compiled with -Wundef When compiling with the flag `-Wundef` the following warning is emitted: ``` [ 40%] Building C object CMakeFiles/hiredis-STATIC.dir/read.c.o In file included from /data/files/users/jerry/github/hiredis/read.c:33:0: /data/files/users/jerry/github/hiredis/fmacros.h:17:5: warning: "__APPLE__" is not defined [-Wundef] #if __APPLE__ && __MACH__ ^ In file included from /usr/include/string.h:25:0, from /data/files/users/jerry/github/hiredis/read.c:34: ```
2016-04-20fix: Remove backwards compatibility macro'sJan-Erik Rediger
Closes #296 BREAKING CHANGE: This removes the redisReplyReader* functions, which are already replaced by redisReader* functions. It renames `redisReplyReaderSetPrivdata`, `redisReplyReaderGetObject` and `redisReplyReaderGetError` to `redisReaderSetPrivdata`, `redisReaderGetObject` and `redisReaderGetError`.
2016-04-20fix: Add sdsalloc.h fileJan-Erik Rediger
2016-04-20Auto merge of #391 - redis:catch-error-buf-overflow, r=badboynot-a-robot
Prevent buffer overflow when formatting the error strncat might copy n+1 bytes (n bytes from the source plus a terminating nul byte). Also strncat appends after the first found nul byte. But all we pass is a buffer we might not have zeroed out already. Closes #380