michael-grunder
f9b248b87c
Merge branch 'hotfix/comment_error'
2013-04-28 11:39:48 -07:00
michael-grunder
4080dd9d0b
Fix comment format
2013-04-28 11:39:34 -07:00
michael-grunder
b4976b6684
Merge branch 'master' of github.com:nicolasff/phpredis
2013-04-28 11:11:22 -07:00
michael-grunder
f9f2dc0dbf
Merge branch 'release/2.2.3'
2013-04-28 11:10:32 -07:00
michael-grunder
3e6d5b60d6
Cutting a release for 2.2.3. Added myself as a maintainer
...
in the header files
2013-04-28 11:09:58 -07:00
Yuki Matsukura
5d1b3a4ddb
Update README.markdown
...
- correct minor example mistake.
2013-04-27 22:06:41 +01:00
Nicolas Favre-Felix
d775e313c2
Merge pull request #331 from matsubo/master
...
Correct wrong example in the README
2013-04-27 14:04:43 -07:00
Yuki Matsukura
f858f615a7
Update README.markdown
...
- correct minor example mistake.
2013-04-28 05:16:01 +09:00
michael-grunder
578bdf08cd
Merge branch 'hotfix/tsrmls_cc' into develop
2013-03-28 07:58:47 -07:00
michael-grunder
4c16a303ef
Merge branch 'hotfix/tsrmls_cc'
2013-03-28 07:58:40 -07:00
michael-grunder
411100da9e
Don't duplicate TSRMLS_CC
2013-03-28 07:56:54 -07:00
michael-grunder
e914485313
Merge branch 'hotfix/inspection_methods' into develop
...
Conflicts:
php_redis.h
redis.c
2013-03-27 11:21:02 -07:00
michael-grunder
7c52f3add1
Merge branch 'hotfix/inspection_methods'
2013-03-27 10:24:31 -07:00
michael-grunder
ef792320e7
Introspection methods
...
This commit adds methods to get information about the state
of our phpredis object, such as what host/port we are connected
to, our timeout, etc...
The following methods have been added:
getHost()
getPort()
getDBNum()
getTimeout()
getReadTimeout()
isConnected()
getPersistentID()
getAuth()
In addition, there is a small memory leak fix when a persistent id
was specifically passed to connect() (it wasn't beeing freed).
Addresses issue #320
2013-03-27 10:21:18 -07:00
michael-grunder
11a1195d8e
Merge branch 'hotfix/php5.2_warnings' into develop
2013-03-20 09:08:56 -07:00
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
25a1593d73
Merge branch 'develop' of github.com:nicolasff/phpredis into develop
2013-03-16 11:55:09 -07:00
michael-grunder
22ebd714bc
Merge branch 'hotfix/eval_alias' into develop
2013-03-16 11:54:07 -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
b2a57c1f9f
Merge branch 'hotfix/serializer_leak' into develop
2013-03-16 11:40:36 -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
4fd6acda89
Merge branch 'feature/client_doc_fmt' into develop
2013-02-25 14:12:48 -08:00
michael-grunder
7deb21fe2d
More formatting
2013-02-25 14:12:20 -08:00
michael-grunder
b096f5771b
Formatting fix
2013-02-25 14:10:53 -08:00
michael-grunder
5582166f77
Fix documentation for CLIENT command
...
Relates to issue #300
2013-02-25 14:08:07 -08:00
michael-grunder
d6c29e4348
Merge branch 'hotfix/fix_return_values' into develop
2013-02-24 17:52:56 -08: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
0816289454
Merge branch 'hotfix/add_retval_zipped_wreply' into develop
2013-02-24 16:47:57 -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
michael-grunder
e457d9813d
Don't return a value from a void function
2013-02-24 16:32:40 -08:00
Emmanuel Merali
6d3c9990a5
Merged changes from @mobli
...
New select DB command to RedisArray - Added retry delay on reconnect
Added the possibility to delay each reconnection attempt, including a
random factor to prevent several or many concurrent connections from
trying to reconnect at the same time.
Added the select command to RedisArray to select a DB on every
connections in one instruction.
Also, fixed a compiler warning:
redis_array_impl.c:1115:15: warning: incompatible pointer types
assigning to 'zval **' (aka 'struct _zval_struct **') from 'zval
**(*)[2]' [-Wincompatible-pointer-types]
Conflicts:
common.h
2013-02-22 09:35:22 -08:00
Nicolas Favre-Felix
a4784b4de7
Merge branch 'hotfix/issue-229' into develop
2013-02-17 16:32:08 +00: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
fb7c7a8d2e
Merge branch 'hotfix/fix-broken-delete-test' into develop
2013-02-17 16:21:20 +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
48b3e6b8c5
Merge branch 'hotfix/ttl-response-type' into develop
2013-02-17 16:18:02 +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
e4842cdeef
Merge branch 'hotfix/document-windows-build' into develop
2013-02-17 15:31:23 +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
c37a7d3610
Merge branch 'hotfix/document_session_on_unix_socket' into develop
2013-02-17 13:38:15 +00:00
