Commit Graph

703 Commits

Author SHA1 Message Date
Eddy Jansson
05fb7be3ea Fix Makefile test to use more compatible syntax
The existing way is not compatible with a lot of shells, including most
bash installations, because the echos that generates the configuration
sent to redis-server doesn't expand the escapes. Adding '-e' to the
echo works under bash, but breaks on the Travis CI server.

This is my attempt to find an alternative that works everywhere.
[committer note: it doesn't work under Solaris make, but the Makefile
was already broken under Solaris make.  Solaris users must use gmake.]

Closes #224 and Closes #221
2014-04-09 17:02:43 -04:00
antirez
2d66c4814e Add missing license and copyright for adapters
This is a backport of
d01aad329c
2014-04-09 17:02:42 -04:00
antirez
334525359a Upgrade sds to latest version
SDS is now broken out of Redis into its own project, so include
the latest version from the SDS repo.

This is a backport of the Redis commit doing the same to the bundled hiredis:
320fa02b9b
2014-04-09 17:02:42 -04:00
Patrick TJ McPhee
4441fa3513 Define _XOPEN_SOURCE for NetBSD
This is backported from
289942b625
2014-04-09 17:02:42 -04:00
Charlie Somerville
4ede1bada1 Define redisLibuvAttach as static
Closes #206
2014-04-09 17:02:42 -04:00
Axel Etcheverry
66192a0052 Add new redisAppendFormatedCommand with tests
Closes #202
2014-04-09 17:02:42 -04:00
John Graham
f20f5ad102 Libuv: Fix compile warnings and C++ compatability
Closes #189
2014-04-09 17:02:42 -04:00
ripcurld00d
303a0421ef Fix "host cannot be resolved test" test
Closes #186
2014-04-09 17:02:42 -04:00
Eddy Jansson
ae30d58ff9 Add redisConnectFd() and redisFreeKeepFd()
These allows for easier integration of hiredis with external
code that wants to manage its fds, say for instance in a pool.

Closes #223
2014-04-09 17:02:42 -04:00
Matt Stancliff
37d25a392c Add ability to bind source address on connect
Some environments require binding to specific source addresses instead
of letting the system determine which IP a connection should originate
from.

Closes #233
2014-04-08 19:37:54 -04:00
Matt Stancliff
61eeedbe77 Fix potential undefined struct read
All the assignments to cb are inside conditionals, so it's
vaguely possible it never gets initialized before we try
to read from it with (cb.fn == NULL).

Condition discovered with scan-build.

Closes #229
2014-04-08 19:37:45 -04:00
Matt Stancliff
e35266e68f Stop redisCheckSocketError from more than checking
redisCheckSocketError should only CheckSocketError and not
close any misbehaving sockets.  If CheckSocketError discovers
a problem, the caller will discover the contest is in ERR
and will start destroying the context (which involves
finalizing all callbacks (which may still be using
fd for something, so we should not close fd until all
callbacks have been told we are failing) and eventually
close the fd in redisFree() immediately before the
context is released).
2014-04-08 19:37:45 -04:00
Matt Stancliff
7f0c7a29fd Remove possiblity of multiple close on same fd
With all the async connects and disconnects and error handling
going on in hiredis, we need to centralize how we close our fd
and set it so it doesn't get re-closed.  Prior to this commit,
sometimes we'd close(fd), run an async error handler, then
call close(fd) again.

To stop multiple closes, we now set fd to -1 after we free it,
but that requires not passing fd as an independent argument to
functions.

This commit moves all fd usage to c->fd.  Since the context
has a fd field and all functions receive the context, it makes
more sense to use the fd inside of c instead of passing along fd
as an independent argument.

Also, by only using c->fd, we can set c->fd after we close it to
signify we shouldn't re-close the same fd again.

This does change one semi-public interface function redisCheckSocketError()
to only take (context) instead of (context, fd).  A search on github
returned zero occasions of people using redisCheckSocketError()
outside of net.{c,h} in hiredis itself.

Commit inspired by the bug report at:
https://groups.google.com/forum/#!topic/redis-db/mQm46XkIPOY

Thanks go out to Thijs for trying high-frequency reconnects on
a host that isn't there.

Closes #230
2014-04-08 19:37:29 -04:00
Pieter Noordhuis
065e90557c Merge pull request #215 from charliesome/fix-bugs
Fix a couple of bugs uncovered by the Clang static analyzer
2014-01-14 17:18:57 -08:00
Charlie Somerville
070da21623 async.c: avoid a NULL deref when redisAsyncInitialize returns NULL 2014-01-15 11:38:45 +11:00
Charlie Somerville
81c95a5fd3 sds.c: avoid leaking tokens when seplen < 1 || len < 0 2014-01-15 11:38:02 +11:00
Pieter Noordhuis
cc3ee45325 Merge branch 'ipv6' 2013-07-11 08:58:05 -07:00
antirez
06919b3f86 Minimal IPv6 support.
redisContextConnectTcp() is now able to use IPv6 addresses if there is
no IPv4 address found resolving the specified hostname.
2013-07-11 11:48:13 +02:00
antirez
253e796a59 example.c: it is now possible to specify server ip/port.
This makes possible to use the example with IPv6 addresses and/or with a
different Redis instance than 127.0.0.1:6379.
2013-07-11 10:25:48 +02:00
Noah Williamsson
fbf1bb648e Mark the timeout parameter as const in various functions
The struct timeval argument in redisConnectWithTimeout(),
redisConnectUnixWithTimeout(), redisSetTimeout(),
redisContextSetTimeout(), redisContextConnectTcp()
and redisContextConnectUnix() is never modified and can
therefore be marked as const.

Signed-off-by: Noah Williamsson <noah.williamsson@gmail.com>
2013-07-10 23:34:49 -07:00
Pieter Noordhuis
c532edc27f Fix const-related compiler errors 2013-07-10 23:31:30 -07:00
Pieter Noordhuis
049346aa33 Merge pull request #132 from nwmcsween/constify
constify: constify some variables / functions
2013-07-10 23:13:36 -07:00
Wolfgang Richter
37a840dc2c Emphasize size_t length for %b formatting
Closes #121.
2013-07-10 23:05:39 -07:00
Pieter Noordhuis
afc462d35d Add note about multi bulk nesting limit (fixes #143) 2013-07-10 22:39:31 -07:00
Pieter Noordhuis
f9ce2111bb Whitespace 2013-07-10 22:37:47 -07:00
Rafael Zanella
6cf2e85bd2 Update example.c
Added a call to redisFree()

Closes #148.
2013-07-10 22:34:46 -07:00
Aaron Bedra
c552ca6904 Move examples into their own folder
Closes #166.
2013-07-10 22:16:53 -07:00
Pieter Noordhuis
49de2cf990 Fix DNS error test (fixes #167) 2013-07-10 21:58:10 -07:00
Pieter Noordhuis
c8234a3193 Merge branch 'libuv'
Closes #172.
2013-07-10 21:47:53 -07:00
Pieter Noordhuis
efe990d07d Fix path to static libuv library 2013-07-10 21:47:44 -07:00
Pieter Noordhuis
9d9e4a3b4f Remove unused Makefile variables
Fixes #176.
2013-07-10 21:24:46 -07:00
Pieter Noordhuis
17d73ef6ad Merge pull request #178 from rfuchs/master
va_copy must be followed by va_end
2013-07-10 21:12:10 -07:00
Pieter Noordhuis
a5e0de0d85 Merge branch 'example-ae' 2013-07-10 21:08:29 -07:00
Pieter Noordhuis
af9bf16953 Call aeStop on error conditions 2013-07-10 21:08:15 -07:00
Erik Dubbelboer
fc55afb1b6 Made example-ae work again 2013-07-02 19:24:02 +02:00
Richard Fuchs
b15650e13a va_copy must be followed by va_end 2013-07-02 12:41:13 -04:00
Erik Dubbelboer
0396159214 Removed unnecessary comments 2013-06-09 14:43:03 +02:00
Erik Dubbelboer
61277d0925 Added libuv adapter 2013-06-04 15:06:43 +02:00
Pieter Noordhuis
bcf8354376 Merge pull request #164 from eugenebolotin/netc_fix_possible_uninitialized_access
Fix possible uninitialized value access due to strerror_r error
2013-05-07 17:54:54 -07:00
Eugene Bolotin
637f54b92c Fix possible uninitialized value access due to strerror_r error 2013-05-07 18:26:05 +04:00
Pieter Noordhuis
94675ea8c8 Merge branch 'gai_strerror'
See pull request #153.
2013-05-01 09:32:10 -07:00
Pieter Noordhuis
b1f07f77d2 Fix style 2013-05-01 09:32:03 -07:00
Pieter Noordhuis
91f47a1c19 Merge branch 'keepalive'
Also see pull request #161.
2013-05-01 09:23:17 -07:00
Pieter Noordhuis
bb3c4c17c4 Make redisKeepAlive work on OSX 2013-05-01 09:23:06 -07:00
Allen.Dou
9dff5105fc Make KeepAlive optional
Make Connection KeepAlive being optional instead of default.
2013-04-30 00:11:57 +08:00
Allen.Dou
8d5bc445e5 SetKeepAlive
Keep client alive even though no command was sent to server for a long time.
2013-04-19 11:26:43 +08:00
Pieter Noordhuis
63ce20dd15 Merge pull request #156 from abedra/master
Set error on invalid timval values for redisConnectWithTimeout (Fixes #154)
2013-04-10 08:58:09 -07:00
Aaron Bedra
fca66b9e8b Set error when invalid timeout value is given to redisConnectWithTimeout
Closes #154

This commit properly sets the error value inside of
redisContextWaitReady when an invalid sec or usec value is provided.
Tests for each case are provided to demonstrate that the issue is
properly fixed and to avoid regression.

Signed-off-by: Aaron Bedra <aaron@aaronbedra.com>
2013-03-14 21:34:21 -05:00
Pieter Noordhuis
6bd1172419 Update CHANGELOG.md 2013-03-14 19:17:32 -07:00
Thordur Bjornsson
e5589afdec Fix tests for test_blocking_connection_errors();
Add strings to allow OpenBSD/OSX to pass.
2013-02-23 10:51:24 +01:00