summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2018-01-05Merge pull request #564 from dmvo/masterJan-Erik Rediger
Remove $(ARCH) expansion from the Makefile
2017-12-28Strip compiler options from the CC variableDmitri Vorobiev
The Makefile checks validity of the compiler command in the CC variable by feeding the contents of that variable to the `type' utility. Some environments include compiler options in the CC variable such as architecture specific tuning flags. For such cases it is necessary to first strip everything except the command itself from the contents of the CC variable prior to checking the command with the type utility, which is what this patch is introducing. We use shell parameter expansion mechanism for this purpose. Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
2017-12-27Remove $(ARCH) expansion from the MakefileDmitri Vorobiev
Some compilation environments (such as Yocto) define the ARCH environment variable to indicate the target architecture. For such enviroments, hiredis build fails, because the expanded $(ARCH) variable in the Makefile gets erroneously interpreted as an argument to the `-ggdb' command line option during the compilation stage or as an input file name during the linking stage. This patch removes $(ARCH) expansions from the Makefile. This doesn't harm cross-compilation, the latter goes fine with the properly assigned CC environment variable. For native builds, this patch does not imply any changes. Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@movial.com>
2017-11-07Merge #554not-a-robot[bot]
554: build: do not assume that INSTALL is cp r=badboy INSTALL is supposed to be `install` in most of the cases which doesn't work with directories, but works perfectly with files. Don't do this assumption. Reported-by: Jiří Vymazal <jvymazal@redhat.com> References: https://bugzilla.redhat.com/show_bug.cgi?id=1506251 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2017-11-07chore: Build only branches bors needsJan-Erik Rediger
2017-10-30build: do not assume that INSTALL is cpIgor Gnatenko
INSTALL is supposed to be `install` in most of the cases which doesn't work with directories, but works perfectly with files. Don't do this assumption. Reported-by: Jiří Vymazal <jvymazal@redhat.com> References: https://bugzilla.redhat.com/show_bug.cgi?id=1506251 Signed-off-by: Igor Gnatenko <i.gnatenko.brain@gmail.com>
2017-09-01Merge pull request #542 from EdwardBetts/spellingJan-Erik Rediger
correct spelling mistake
2017-09-01correct spelling mistakeEdward Betts
2017-07-15Merge #533not-a-robot[bot]
533: Small fixes r=badboy
2017-07-15Merge #524 #525not-a-robot[bot]
524: Don't pass a negative value to __redisAsyncCommand if redisFormatSdsCommandArgv fails r=badboy 525: Fix compilation on FreeBSD 10.3 with default compiler r=badboy Given FreeBSD 10.3 with default compiler: > $ cc -v > FreeBSD clang version 3.4.1 (tags/RELEASE_34/dot1-final 208032) 20140512 > Target: x86_64-unknown-freebsd10.3 Defining _XOPEN_SOURCE to 600 on the fixed line leads to the following errors: > cc -std=c99 -pedantic -c -O3 -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings -g -ggdb net.c > net.c:435:29: error: use of undeclared identifier 'AF_LOCAL' > if (redisCreateSocket(c,AF_LOCAL) < 0) > ^ > net.c:460:21: error: use of undeclared identifier 'AF_LOCAL' > sa.sun_family = AF_LOCAL; > ^ > 2 errors generated. > AF_LOCAL is defined in sys/socket.h within ifdef __BSD_VISIBLE. __BSD_VISIBLE could be defined in sys/cdefs.h, but it is never done if _XOPEN_SOURCE is defined. So on FreeBSD _XOPEN_SOURCE shouldn't be defined.
2017-07-15Merge #523not-a-robot[bot]
523: Fix leak if setsockopt fails r=badboy
2017-06-16Merge pull request #532 from amallia/assert-side-effectsJan-Erik Rediger
Assert statement calls a function which has side effects
2017-06-15Small fixesamallia
2017-06-15Assert statement calls a function which has side effectsamallia
2017-05-17Fix compilation on FreeBSD 10.3 with default compilereldarko
2017-05-15Don't pass a negative value to __redisAsyncCommand if ↵Frederik Deweerdt
redisFormatSdsCommandArgv fails
2017-05-15Fix leak if setsockopt failsFrederik Deweerdt
2017-04-07Merge pull request #514 from zfzsoft/patch-1Jan-Erik Rediger
redisLibeventCleanup will be leak
2017-04-07Merge pull request #516 from redis/changed-cygwinJan-Erik Rediger
chore(CI): Skip installing Cygwin
2017-04-07chore(CI): Skip installing CygwinJan-Erik Rediger
2017-04-07Merge pull request #473 from trustfarm-dev/masterJan-Erik Rediger
Build error when make examples , patch with glib-2.0 positon move will solve.
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-10-10Build error patch with glib-2.0Trustfarm-heart
In case of some glib-2.0 linker error , make examples can't link with glib2.0, in this case -lglib-2.0 to after includes and move to last will solve the issues.
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