michael-grunder
b2ffb7ac75
Merge branch 'hotfix/php5.2_warnings'
2013-03-20 09:08:36 -07:00
michael-grunder
8596eac45e
Use another NULL for zend_is_callable_ex
...
Given that PHP 5.2.X and PHP 5.3.X use a different signature
for zend_is_callable_ex, and we're not using the error return
(PHP 5.3.X) anyway, just pass in NULL.
Addresses issue #318
2013-03-20 09:00:57 -07:00
michael-grunder
d287163de2
Merge branch 'hotfix/eval_alias'
2013-03-16 11:53:55 -07:00
michael-grunder
c39ecd52f3
Alias eval and evalsha
2013-03-16 11:48:51 -07:00
michael-grunder
f3a3fcef75
Merge branch 'hotfix/serializer_leak'
2013-03-15 16:35:18 -07:00
michael-grunder
a4627bb94b
Fixes a memory leak, and possible undefined behavior if we have
...
a serialization failure and just return the raw contents of a key.
Addresses issue #315
2013-03-15 16:34:05 -07:00
michael-grunder
5e5fa7895f
Merge branch 'hotfix/fix_return_values'
2013-02-24 17:52:39 -08:00
michael-grunder
703476ce01
Fix each place we're erroring out but return a value as the
...
methods are int returns
Resolves issues pertaining to #303
2013-02-24 17:51:56 -08:00
michael-grunder
117cc22d75
Merge branch 'hotfix/add_retval_zipped_wreply'
2013-02-24 16:47:40 -08:00
michael-grunder
9954974778
Return a proper value
...
redis_sock_read_multibulk_reply_zipped_with_flag should always return
a value. We merged in a change that handled a certain error condition
that was using RETURN_FALSE (and therefore not returning a value)
Simply changed this to RETVAL_FALSE and return -1;
2013-02-24 16:45:11 -08:00
Nicolas Favre-Felix
51264b7834
Merge branch 'hotfix/issue-229'
2013-02-17 16:32:06 +00:00
Nicolas Favre-Felix
5953e8fe13
Merge branch 'rnamiki-master' into hotfix/issue-229
2013-02-17 16:26:18 +00:00
Nicolas Favre-Felix
16188394d4
Merge branch 'hotfix/fix-broken-delete-test'
2013-02-17 16:21:18 +00:00
Nicolas Favre-Felix
8b4ee3dda2
Fix broken test with unexpected result for delete
2013-02-17 16:20:44 +00:00
Nicolas Favre-Felix
4548a25fc4
Merge branch 'hotfix/ttl-response-type'
2013-02-17 16:17:55 +00:00
Nicolas Favre-Felix
90bdf9e8fd
Fix test for TTL return value
...
Resolves issue #302
2013-02-17 16:17:25 +00:00
Nicolas Favre-Felix
4231d70b66
Merge branch 'master' of https://github.com/rnamiki/phpredis into rnamiki-master
2013-02-17 16:07:39 +00:00
Nicolas Favre-Felix
3e777b4365
Merge branch 'hotfix/document-windows-build'
2013-02-17 15:31:22 +00:00
Nicolas Favre-Felix
df060ca2ce
Link to instructions on how to build on Windows
2013-02-17 15:30:20 +00:00
Nicolas
7d1d7037b8
Merge branch 'hotfix/document_session_on_unix_socket'
2013-02-17 13:38:13 +00:00
Nicolas
507ba7c513
Document unix sockets with the session handler
2013-02-17 13:37:22 +00:00
Nicolas
05b233bdca
Merge branch 'hotfix/document_array_distributor'
2013-02-17 13:28:53 +00:00
Nicolas
b6721c1292
Document and test custom key distribution function
...
Solves issue #299
2013-02-17 13:28:00 +00:00
michael-grunder
804478e097
Merge branch 'hotfix/remove_debug'
2013-02-15 18:01:30 -08:00
michael-grunder
31174e8e77
Just removed a debug line
2013-02-15 18:01:11 -08:00
michael-grunder
55dd05356d
Merge remote-tracking branch 'kotas/opt-read-timeout'
...
Conflicts:
library.c
2013-02-11 12:42:49 -08:00
michael-grunder
85ee61d19b
Add prefix support to SUBSCRIBE/PSUBSCRIBE
...
Now the Redis::OPT_PREFIX will apply to subscribe/psubscribe
channels and will be applied before searching for messages.
2013-02-04 14:45:54 -08:00
michael-grunder
242a16d50a
Merge branch 'srandmember_count'
...
Conflicts:
tests/TestRedis.php
2013-02-04 13:22:29 -08:00
michael-grunder
71a002d7fe
Pulling README.markdown from master
2013-02-04 13:18:22 -08:00
michael-grunder
c1e7da4256
Fix markdown formatting
2013-02-04 13:13:00 -08:00
michael-grunder
87dddda2ab
Update documentation to new format for our count argument
2013-02-04 13:10:48 -08:00
michael-grunder
f702e88348
Merge remote-tracking branch 'origin/hmset_performance'
2013-02-04 13:01:07 -08:00
Michael Grunder
e6fc44a9d8
Merge pull request #289 from goodsoft/patch-1
...
Updated version in debian.control
2013-01-25 09:43:00 -08:00
goodsoft
f85b332f91
Update debian.control
...
Updated version in debian.control
2013-01-25 17:29:58 +02:00
Michael Grunder
b991385672
Merge pull request #269 from shtouff/debian
...
a small fix in debianization: conflict after package rename
2013-01-24 08:33:33 -08:00
michael-grunder
6529458c0e
Add include for smart_str
2013-01-19 13:34:26 -08:00
michael-grunder
e1a5145ad2
Changed the way we build the HMSET command such that we don't
...
continue to destroy and reallocate the command buffer
Added a simply library routine to append to a command buffer
using a smart_str
Made the unit tests work even if you're not compiled with
igbinary
Addresses issue #287
2013-01-18 18:05:02 -08:00
Michael Grunder
07369ed1fb
Merge pull request #272 from pepve/brpoplpush
...
Thanks for the pull, merging.
2013-01-16 09:19:56 -08:00
michael-grunder
93f77be960
Checks for tv.tv_usec as well as tv.tv_sec when setting the read
...
timeout option on our socket. We were actually ignoring timeouts
< 1 second because of this.
Nice catch by @xiaoyjy
Fixes #286
2013-01-13 21:59:13 -08:00
Nicolas Favre-Felix
6d244bbe50
Merge pull request #276 from titpetric/master
...
Updated README.markdown
2012-11-29 09:14:08 -08:00
Tit Petric
fde191991e
footer hr after keys toc
2012-11-27 16:21:58 +01:00
Tit Petric
dce8a704e3
Keys and strings toc import
2012-11-27 16:20:05 +01:00
Tit Petric
968d3fd8bc
link keys and strings
2012-11-27 16:01:50 +01:00
Tit Petric
b99022893b
llen fix, alias exists
2012-11-27 15:55:06 +01:00
Tit Petric
b8ee6128f3
lists and list toc
2012-11-27 15:47:32 +01:00
Tit Petric
0cf7c8813a
transactions, pub/sub sections, toc
2012-11-27 15:28:10 +01:00
Tit Petric
328f599c38
moved hash methods under heading, created toc
2012-11-27 15:18:11 +01:00
Tit Petric
a6a51a9a48
scripting methods, created toc
2012-11-27 15:10:40 +01:00
Tit Petric
1c6ee3e2e8
alphabetized set methods, created toc
2012-11-27 15:02:01 +01:00
Tit Petric
3d055f8390
alphabetized sorted set methods, created toc
2012-11-27 14:43:56 +01:00
