Commit Graph

613 Commits

Author SHA1 Message Date
David Watson
dc13bc8627 Add PKGCONFNAME to install dependencies.
Attempting to use the install target before the make target works fine,
except for the missing pkgconfig file.  Adding that file to the
dependencies for the install target to make sure it gets created first.
2015-03-28 12:17:11 -04:00
Jan-Erik Rediger
421e0f33f4 Merge pull request #314 from tzickel/master
Added support for compiling the parser code with Microsoft Visual C compiler.
2015-03-27 14:28:47 +01:00
Jan-Erik Rediger
30814af63c Correct escaping for prefix in pkgconf file 2015-03-19 09:21:25 +01:00
Jan-Erik Rediger
5c12fa4ce4 Merge pull request #316 from boardwalk/master
Fix hiredis.pc generation.
2015-03-19 09:20:31 +01:00
Dan Skorupski
97364ed59a Fix hiredis.pc generation. 2015-03-18 18:56:11 -05:00
Jan-Erik Rediger
796305a307 Merge pull request #315 from badboy/travis-fix
Update apt repos first
2015-03-18 12:50:19 +01:00
Jan-Erik Rediger
0f6ad5c460 Update apt repos first 2015-03-18 10:39:45 +01:00
tzickel
ec229678c2 Added support for compiling the parser code with Microsoft Visual C compiler.
For hiredis-py and others support on windows.
2015-03-13 15:58:23 +02:00
Dominique Leuenberger
37c06facda Fix pkgconf file: escaping needed
Due to the various processors going over the command, we need more
escaping.

1) Make parses it, so $${libdir} becomes ${libdir}
2) 'shell' parses it for the 'echo command', whereas echo ${libdir}
would be an empty string; escape it as \${libdir} to ensure we get what
we want.

Closes #312
2015-03-03 08:12:49 -08:00
Matt Stancliff
27076a3e6d Fix tests when assert() undefined
Closes #309

(such as when -DNDEBUG disables all assert() macros)

Inspired by keith-bennett-gbg, but re-rewritten to be more concise.
2015-02-18 14:45:03 -05:00
Matt Stancliff
6b122d43f9 Fix pkgconf when used with DESTDIR
Closes #302
2015-02-12 13:58:14 -05:00
Matt Stancliff
9be3a07d8a Release hiredis 0.12.1
Major fix:
  - `make install` now works properly

Minor fix:
  - `make test` now works after `make 32bit` on a 64-bit platform
  - added more automated travis tests
2015-01-26 10:08:40 -05:00
Matt Stancliff
d3fb491b85 Add more travis tests
Adds travis testing for 32bit builds as well as compile warnings
on 64 bit and 32 bit builds.
2015-01-26 10:08:40 -05:00
Matt Stancliff
2b2b512dca Build test binary by default
This is the only way to force a 32-bit build of the test binary
2015-01-26 10:08:12 -05:00
Matt Stancliff
74f53e30db Fix pkgconf build dependency
We need to re-gen pkgconf when the version changes, and the version
is kept in hiredis.h, so make pkgconf depend on hiredis.h.
2015-01-26 09:41:11 -05:00
Sebastian Wiedenroth
4355ab3c8f Fix Makefile install problems
Adds DESTDIR support
Fixes INSTALL_PKGCONF_PATH
Properly copies {read,shs}.h now during make install

Closes #297
2015-01-26 09:30:17 -05:00
Matt Stancliff
7b51834c16 Increase version to 0.12.0 2015-01-22 16:00:38 -05:00
Matt Stancliff
bbd6044e35 Update changelog for 0.12.0 2015-01-22 16:00:38 -05:00
Matt Stancliff
dd680fcc14 Add valgrind to TravisCI testing 2015-01-22 16:00:38 -05:00
Matt Stancliff
3c023ee157 Cleanup memory during test 2015-01-22 16:00:38 -05:00
Matt Stancliff
195aca3427 Improve digit counting for multibulk creation
This replaces the old intlen() implementation with a slightly
faster way of counting digits.

Implementation taken from the same place where digits10() in
redis/src/util.c came from.

The old 'intlen' allowed negative inputs, but no usage in hiredis
was passing negative numbers, so that ability is removed.  Also,
the new implementation can count higher (uint64_t) instead of
limited to just int as before.

Fixes #295 by replacing implementation
2015-01-22 16:00:38 -05:00
Matt Stancliff
802456def1 Use known-bad hostname when testing hostname fail
Suggested at
https://github.com/redis/hiredis/issues/294#issuecomment-69153074

This change also makes the test stop hanging for 10 to 30 seconds
waiting for the resolver to timeout.  Now the resolver immediately
sees the hostname is bad and returns error without waiting for timeout.
2015-01-08 17:28:55 -05:00
Matt Stancliff
c642079a80 Update test error message detection for dead hosts
Fixes #294
2015-01-08 17:26:22 -05:00
Matt Stancliff
74b7495f93 Silence _BSD_SOURCE warnings
glibc 2.20 requires _DEFAULT_SOURCE and doesn't like _BSD_SOURCE alone

Also see:
 - https://github.com/antirez/redis/pull/2189
 - https://sourceware.org/glibc/wiki/Release/2.20#Deprecation_of__BSD_SOURCE_and__SVID_SOURCE_feature_macros

Thanks to badboy for pointing out the problem at
https://github.com/redis/hiredis/issues/288#issuecomment-68849454
2015-01-06 17:55:55 -05:00
Matt Stancliff
f28872ca70 Cleanup tabs and end of line whitespace 2015-01-05 16:53:23 -05:00
Matt Stancliff
dad0516423 Update dependency list in Makefile 2015-01-05 16:53:23 -05:00
Matt Stancliff
9abfdf9405 Build static library by default 2015-01-05 16:53:23 -05:00
Matt Stancliff
1d2b4d38db Generate pkgconf during build
The pkgconf source is localized to the Makefile, so we're not dropping
an unnecessary "hiredis.pc.in" in the source directory.

Closes #129
Closes #136
2015-01-05 16:53:23 -05:00
Matt Stancliff
cc20232406 Fix errno error buffers to not clobber errors
The strerror_r API has two flavors depending on system options.

The bad flavor uses a static buffer for returning results, so if
you save the pointer from strerror_r, the string you're referencing
becomes useless if anybody else calls strerror_r again

The good flavor does what you expect: it writes the error to your buffer.

This commit uses strerror_r directly if it's a good version or copies
the static buffer into our private buffer if it's a bad version.

Thanks to gemorin for explaining the problem and drafting a fix.

Fixes #239
2015-01-05 16:53:23 -05:00
tzickel
ba3e74c408 Refactor reading code into read.c
Makes hiredis reading functions easier to include in external projects

[fixed all merge conflicts against current version]

Closes #249
2015-01-05 16:53:22 -05:00
Matt Stancliff
0cacb485fe Fix sds building with C++
These should really just be macros to shut up our type system.
2015-01-05 16:53:22 -05:00
Matt Stancliff
6a00a4643b Fix redisAppendCommand error result
Previously, redisvAppendCommand() would return OOM even with formatting
errors.  Now we use OTHER with an error string telling the user the
error was formatting related, not memory related.

This also fixes a potentially worse bug where were would pass error result
of -1 as an actual length to another function taking an unsigned length,
which would result in crash/overallocation/errors.  Now for that case,
we just return an error immediately and stop processing the command.

Fixes #177
2015-01-05 16:52:08 -05:00
Christian Hergert
0c9ff5bb03 Add GLib 2.0 adapter
[Cleaned up Makefile and header includes.  Didn't change crazy
coding style because it's the convention for GLib systems.]

Closes #83
Closes #71
2015-01-05 16:39:30 -05:00
NanXiao
e30c96ebde Add empty pointer check in error cleanup
If realloc fails, the curargv will be NULL.

Closes #253
2015-01-05 16:39:30 -05:00
NanXiao
d1e820d8ee Add error check in redisContextInit
Check whether the obuf or reader is empty: if one of the items is empty,
free the redisContext.
2015-01-05 16:39:30 -05:00
Nan Xiao
b6a860795c Fix redisvFormatCommand format parsing
Flags can occur in any order in format string, so we can't assume any order.

In original code, the redisvFormatCommand can process " %#+d" correctly,
but can't process "%+#d".

Closes #257
2015-01-05 16:39:30 -05:00
Matt Stancliff
9a753b4251 Add API to free hiredis (sds) formattings
External callers may not know about sdsfree, so let's
give them an easy way to know how to free their sds result.
2015-01-05 16:39:30 -05:00
Mareq
1b392eb796 Add API to free hiredis (char *) formattings
[Cleaned up:
  - name of function: freeRedis... -> redisFree...
  - return value of function (free doesn't return anything)
  - parameter type for function.
    - we don't need to free a char**, the char** is just
    for returning from the assignment functoin.]

Closes #250
2015-01-05 16:39:30 -05:00
Chris Lamb
85c6bfb02a Fix build under kfreebsd
Signed-off-by: Chris Lamb <chris@chris-lamb.co.uk>

[Instead of checking for "not solaris" we feature detect
for availability of what we want, then remove the system
that advertises compatability but doesn't actually provide it
(given our assumptions about what we're guarding).]

Closes #254
2015-01-05 16:39:30 -05:00
Matt Stancliff
9b83ddc2d9 Fix clang analyzer warning
redisAsyncInitialize() can return NULL, but then we pass
the return value from redisAsyncInitialize() into something
dereferencing the return value, which can cause crashies.
2015-01-05 16:39:30 -05:00
mike
7c4d2557c4 Add support for SO_REUSEADDR
[This introduces some new API functions.]

* Adds new flag to the connection context indicating SO_REUSEADDR
  should be set.
* Adds max number of retries constant for when connect() hits
  EADDRNOTAVAIL.
* Adds new function, redisAsyncConnectBindWithReuse(), letting
  clients enable this functionality.

[Removed trailing whitespace in new header lines.]

Closes #264
2015-01-05 16:39:30 -05:00
jinguoli
a1bc89b236 Improve calloc() correctness
[It doesn't _actually_ matter, but technically
the order argument is: (number of items, size of items)]

Closes #279
2015-01-05 16:39:30 -05:00
torque
9c57314489 Cleanup libuv adapter
This:
  - Removes misplaced libuv function prototype
  - Includes stdlib for free()

Closes #251
2015-01-05 16:38:57 -05:00
michael-grunder
40f7035ba4 Improve redisAppendCommandArgv performance
OK, perhaps the second time is a charm.  I forgot that I had
hiredis forked from a long time ago, so the initial pull
request was hosed.  :)

* Pulled in sdscatfmt() from Redis, and modified it to accept a
  size_t (%T) style format specifier.

* Pulled in sdsll2str() and sdsull2str() from Redis (needed by
  sdscatfmt).

* Added a new method, redisFormatSdsCommandArgv() which takes
  and sds* as the target, rather than char* (and uses sdscatfmt
  instead of sprintf for the construction).

I get roughly the following improvement:

Old: 1.044806
New: 0.481620

The benchmark code itself can be found here:
https://gist.github.com/michael-grunder/c92ef31bb632b3d0ad81

Closes #260
2015-01-05 11:21:38 -05:00
Hang Su
3315c09839 Use stricter function argument types
'const' where we can.

Closes #268
2015-01-05 11:21:38 -05:00
Chris Williams
865a3683a3 Fix README typos
Closes #267
2015-01-05 11:21:38 -05:00
Gary Grossman
2d814b8da3 Fix minor comment problems
"sdscatpritf" -> "sdscatprintf"
Example used sdsempty("text") but should say sdsnew("text")

Closes #282
2015-01-05 11:21:38 -05:00
Mohnish Thallavajhula
abbd340785 Fix README typo
Closes #285
2015-01-05 11:21:38 -05:00
Jan-Erik Rediger
2a6dbdd225 Free string if it is unused
If the string is already in the dict, we need to free this.

Original fix by @tt33415366.

Fixes #256
Closes #286
2015-01-05 11:21:38 -05:00
Ryan Jacobs
a1f6ce0194 Add syntax highlighting to README.md
Closes #293
2015-01-05 09:32:03 -05:00