diff options
| author | vostok4 <vostok4@gmail.com> | 2014-04-09 13:14:45 +0400 |
|---|---|---|
| committer | vostok4 <vostok4@gmail.com> | 2014-04-09 13:14:45 +0400 |
| commit | 9c12c40a66cbd76f5efa053b1718fa936320400b (patch) | |
| tree | 1dc06d47d219fde0b27b5066dd823afd6f349cf5 /php_redis.h | |
| parent | 978fbcf6fc355fcd344feb76ab4b7d6b77e9f7c1 (diff) | |
Merge nicolasff:b9a16b5ad5 in, fixing for Win32
Now we should be up to master with upstream for an easier merge.
Diffstat (limited to 'php_redis.h')
| -rw-r--r-- | php_redis.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/php_redis.h b/php_redis.h index 905c7b3b..ccc2e724 100644 --- a/php_redis.h +++ b/php_redis.h @@ -14,6 +14,7 @@ +----------------------------------------------------------------------+ | Original author: Alfonso Jimenez <yo@alfonsojimenez.com> | | Maintainer: Nicolas Favre-Felix <n.favre-felix@owlient.eu> | + | Maintainer: Michael Grunder <michael.grunder@gmail.com> | | Maintainer: Nasreddine Bouafif <n.bouafif@owlient.eu> | +----------------------------------------------------------------------+ */ @@ -128,6 +129,7 @@ PHP_METHOD(Redis, slaveof); PHP_METHOD(Redis, object); PHP_METHOD(Redis, bitop); PHP_METHOD(Redis, bitcount); +PHP_METHOD(Redis, bitpos); PHP_METHOD(Redis, eval); PHP_METHOD(Redis, evalsha); @@ -141,6 +143,7 @@ PHP_METHOD(Redis, time); PHP_METHOD(Redis, getLastError); PHP_METHOD(Redis, clearLastError); PHP_METHOD(Redis, _prefix); +PHP_METHOD(Redis, _serialize); PHP_METHOD(Redis, _unserialize); PHP_METHOD(Redis, mset); @@ -181,9 +184,18 @@ PHP_METHOD(Redis, setOption); PHP_METHOD(Redis, config); PHP_METHOD(Redis, slowlog); +PHP_METHOD(Redis, wait); +PHP_METHOD(Redis, pubsub); PHP_METHOD(Redis, client); +/* SCAN and friends */ +PHP_METHOD(Redis, scan); +PHP_METHOD(Redis, hscan); +PHP_METHOD(Redis, sscan); +PHP_METHOD(Redis, zscan); + +/* Reflection */ PHP_METHOD(Redis, getHost); PHP_METHOD(Redis, getPort); PHP_METHOD(Redis, getDBNum); @@ -257,7 +269,7 @@ extern zend_module_entry redis_module_entry; #define phpext_redis_ptr redis_module_ptr -#define PHP_REDIS_VERSION "2.2.4" +#define PHP_REDIS_VERSION "2.2.5" #endif |