Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 2e5a710

Browse files
michael-grundermichael-grunder
committed
Merge branch 'php7' of github.com:phpredis/phpredis into php7
2 parents 4468c75 + ea98401 commit 2e5a710

File tree

7 files changed

+40
-38
lines changed

7 files changed

+40
-38
lines changed

‎config.w32

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ ARG_ENABLE("redis-igbinary", "whether to enable igbinary serializer support", "n
77
if (PHP_REDIS != "no") {
88
var sources = "redis.c redis_commands.c library.c redis_session.c redis_array.c redis_array_impl.c redis_cluster.c cluster_library.c";
99
if (PHP_REDIS_SESSION != "no") {
10-
ADD_SOURCES(configure_module_dirname, "redis_session.c", "redis");
1110
ADD_EXTENSION_DEP("redis", "session");
1211
ADD_FLAG("CFLAGS_REDIS", ' /D PHP_SESSION=1 ');
1312
AC_DEFINE("HAVE_REDIS_SESSION", 1);

‎library.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@
3434
/* This proto is available from 5.5 on only */
3535
PHP_REDIS_API int usleep(unsigned int useconds);
3636
# endif
37+
# if PHP_MAJOR_VERSION >= 7
38+
PHP_REDIS_API int usleep(unsigned int useconds);
39+
# endif
3740
#endif
3841

3942
extern zend_class_entry *redis_ce;

‎redis.c

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -708,8 +708,7 @@ PHP_REDIS_API int redis_connect(INTERNAL_FUNCTION_PARAMETERS, int persistent) {
708708
size_t host_len;
709709
char *host = NULL;
710710

711-
long port = -1;
712-
long retry_interval = 0;
711+
zend_long port = -1, retry_interval = 0;
713712

714713
char *persistent_id = NULL;
715714
size_t persistent_id_len = -1;
@@ -1411,7 +1410,7 @@ PHP_REDIS_API void generic_sort_cmd(INTERNAL_FUNCTION_PARAMETERS, char *sort,
14111410
char *key = NULL, *pattern = NULL, *get = NULL, *store = NULL, *cmd;
14121411
size_t key_len, pattern_len=-1, get_len=-1, store_len=-1, cmd_len;
14131412
int key_free;
1414-
long sort_start = -1, sort_count = -1;
1413+
zend_long sort_start = -1, sort_count = -1;
14151414

14161415
int cmd_elements;
14171416

@@ -1770,7 +1769,7 @@ PHP_METHOD(Redis, select) {
17701769

17711770
char *cmd;
17721771
int cmd_len;
1773-
long dbNumber;
1772+
zend_long dbNumber;
17741773

17751774
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(), "Ol",
17761775
&object, redis_ce, &dbNumber) == FAILURE) {
@@ -2209,7 +2208,7 @@ PHP_METHOD(Redis, multi)
22092208
int response_len, cmd_len;
22102209
char * response;
22112210
zval *object;
2212-
long multi_value = MULTI;
2211+
zend_long multi_value = MULTI;
22132212

22142213
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
22152214
"O|l", &object, redis_ce, &multi_value)
@@ -2648,7 +2647,7 @@ PHP_METHOD(Redis, slaveof)
26482647
char *cmd = "", *host = NULL;
26492648
int cmd_len;
26502649
size_t host_len;
2651-
long port = 6379;
2650+
zend_long port = 6379;
26522651

26532652
if (zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
26542653
"O|sl", &object, redis_ce, &host,
@@ -2802,7 +2801,7 @@ PHP_METHOD(Redis, slowlog) {
28022801
char *arg, *cmd;
28032802
int cmd_len;
28042803
size_t arg_len;
2805-
long option;
2804+
zend_long option;
28062805
enum {SLOWLOG_GET, SLOWLOG_LEN, SLOWLOG_RESET} mode;
28072806

28082807
// Make sure we can get parameters
@@ -2856,7 +2855,7 @@ PHP_METHOD(Redis, slowlog) {
28562855
PHP_METHOD(Redis, wait) {
28572856
zval *object;
28582857
RedisSock *redis_sock;
2859-
long num_slaves, timeout;
2858+
zend_long num_slaves, timeout;
28602859
char *cmd;
28612860
int cmd_len;
28622861

@@ -3155,7 +3154,7 @@ PHP_METHOD(Redis, evalsha)
31553154
char *cmd, *sha;
31563155
int cmd_len;
31573156
size_t sha_len;
3158-
long keys_count = 0;
3157+
zend_long keys_count = 0;
31593158
RedisSock *redis_sock;
31603159

31613160
if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
@@ -3193,7 +3192,7 @@ PHP_METHOD(Redis, eval)
31933192
char *script, *cmd = "";
31943193
int cmd_len;
31953194
size_t script_len;
3196-
long keys_count = 0;
3195+
zend_long keys_count = 0;
31973196

31983197
// Attempt to parse parameters
31993198
if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
@@ -3352,7 +3351,7 @@ PHP_METHOD(Redis, migrate) {
33523351
size_t host_len, key_len;
33533352
int cmd_len, key_free;
33543353
zend_bool copy=0, replace=0;
3355-
long port, dest_db, timeout;
3354+
zend_long port, dest_db, timeout;
33563355

33573356
// Parse arguments
33583357
if(zend_parse_method_parameters(ZEND_NUM_ARGS() TSRMLS_CC, getThis(),
@@ -3792,7 +3791,8 @@ generic_scan_cmd(INTERNAL_FUNCTION_PARAMETERS, REDIS_SCAN_TYPE type) {
37923791
char *pattern=NULL, *cmd, *key=NULL;
37933792
size_t key_len = 0, pattern_len = 0;
37943793
int cmd_len, num_elements, key_free=0;
3795-
long count=0, iter;
3794+
zend_long count=0;
3795+
long iter;
37963796

37973797
/* Different prototype depending on if this is a key based scan */
37983798
if(type != TYPE_SCAN) {

‎redis_cluster.c

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1805,11 +1805,11 @@ static void cluster_eval_cmd(INTERNAL_FUNCTION_PARAMETERS, redisCluster *c,
18051805
redisClusterNode *node=NULL;
18061806
char *lua, *key;
18071807
int key_free, args_count=0;
1808-
size_t lua_len, key_len;
1808+
size_t lua_len, key_len;
18091809
zval *z_arr=NULL, *z_ele;
18101810
HashTable *ht_arr;
18111811
HashPosition ptr;
1812-
long num_keys = 0;
1812+
zend_long num_keys = 0;
18131813
short slot;
18141814
smart_string cmdstr = {0};
18151815

@@ -2369,11 +2369,12 @@ static void cluster_kscan_cmd(INTERNAL_FUNCTION_PARAMETERS,
23692369
redisCluster *c = Z_REDIS_OBJ_P(getThis());
23702370
char *cmd, *pat=NULL, *key=NULL;
23712371
int cmd_len, key_free=0;
2372-
size_t key_len, pat_len;
2372+
size_t key_len, pat_len;
23732373
short slot;
23742374
zval *z_it;
23752375
HashTable *hash;
2376-
long it, num_ele, count=0;
2376+
long it, num_ele;
2377+
zend_long count;
23772378

23782379
// Can't be in MULTI mode
23792380
if(!CLUSTER_IS_ATOMIC(c)) {
@@ -2464,7 +2465,8 @@ PHP_METHOD(RedisCluster, scan) {
24642465
size_t pat_len;
24652466
short slot;
24662467
zval *z_it, *z_node;
2467-
long it, num_ele, count=0;
2468+
long it, num_ele;
2469+
zend_long count;
24682470

24692471
/* Treat as read-only */
24702472
c->readonly = CLUSTER_IS_ATOMIC(c);

‎redis_commands.c

Lines changed: 17 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ int redis_key_long_val_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
111111
char *key = NULL, *val=NULL;
112112
size_t key_len, val_len;
113113
int val_free, key_free;
114-
long expire;
114+
zend_long expire;
115115
zval *z_val;
116116

117117
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slz", &key, &key_len,
@@ -145,7 +145,7 @@ int redis_key_long_str_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
145145
char *key, *val;
146146
size_t key_len, val_len;
147147
int key_free;
148-
long lval;
148+
zend_long lval;
149149

150150
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sls", &key, &key_len,
151151
&lval, &val, &val_len)==FAILURE)
@@ -313,7 +313,7 @@ int redis_key_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
313313
char *key;
314314
size_t key_len;
315315
int key_free;
316-
long lval;
316+
zend_long lval;
317317

318318
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sl", &key, &key_len,
319319
&lval)==FAILURE)
@@ -348,7 +348,7 @@ int redis_key_long_long_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
348348
char *key;
349349
size_t key_len;
350350
int key_free;
351-
long val1, val2;
351+
zend_long val1, val2;
352352

353353
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll", &key, &key_len,
354354
&val1, &val2)==FAILURE)
@@ -476,7 +476,7 @@ int redis_zrange_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
476476
char *key;
477477
size_t key_len;
478478
int key_free;
479-
long start, end;
479+
zend_long start, end;
480480
zend_bool ws=0;
481481

482482
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sll|b", &key, &key_len,
@@ -863,7 +863,7 @@ int redis_zrangebylex_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
863863
char *key, *min, *max;
864864
size_t key_len, min_len, max_len;
865865
int key_free;
866-
long offset, count;
866+
zend_long offset, count;
867867
int argc = ZEND_NUM_ARGS();
868868

869869
/* We need either 3 or 5 arguments for this to be valid */
@@ -1301,7 +1301,7 @@ int redis_brpoplpush_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
13011301
size_t key1_len, key2_len;
13021302
int key1_free, key2_free;
13031303
short slot1, slot2;
1304-
long timeout;
1304+
zend_long timeout;
13051305

13061306
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl", &key1, &key1_len,
13071307
&key2, &key2_len, &timeout)==FAILURE)
@@ -1356,7 +1356,7 @@ redis_atomic_increment(INTERNAL_FUNCTION_PARAMETERS, int type,
13561356
char *key;
13571357
int key_free;
13581358
size_t key_len;
1359-
long val = 1;
1359+
zend_long val = 1;
13601360

13611361
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &key, &key_len,
13621362
&val)==FAILURE)
@@ -1416,7 +1416,7 @@ int redis_hincrby_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
14161416
char *key, *mem;
14171417
size_t key_len, mem_len;
14181418
int key_free;
1419-
long byval;
1419+
zend_long byval;
14201420

14211421
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "ssl", &key, &key_len,
14221422
&mem, &mem_len, &byval)==FAILURE)
@@ -1651,7 +1651,7 @@ int redis_bitpos_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
16511651
char *key;
16521652
int argc;
16531653
size_t key_len;
1654-
long bit, start, end;
1654+
zend_long bit, start, end;
16551655

16561656
argc = ZEND_NUM_ARGS();
16571657
if(zend_parse_parameters(argc TSRMLS_CC, "sl|ll", &key, &key_len, &bit,
@@ -1756,7 +1756,7 @@ int redis_bitcount_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
17561756
char *key;
17571757
size_t key_len;
17581758
int key_free;
1759-
long start = 0, end = -1;
1759+
zend_long start = 0, end = -1;
17601760

17611761
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|ll", &key, &key_len,
17621762
&start, &end)==FAILURE)
@@ -2050,7 +2050,7 @@ int redis_setbit_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
20502050
char *key;
20512051
size_t key_len;
20522052
int key_free;
2053-
long offset;
2053+
zend_long offset;
20542054
zend_bool val;
20552055

20562056
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "slb", &key, &key_len,
@@ -2130,7 +2130,7 @@ int redis_lrem_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
21302130
size_t key_len;
21312131
int key_free, val_free;
21322132
size_t val_len;
2133-
long count = 0;
2133+
zend_long count = 0;
21342134
zval *z_val;
21352135

21362136
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "sz|l", &key, &key_len,
@@ -2262,7 +2262,7 @@ int redis_srandmember_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
22622262
char *key;
22632263
size_t key_len;
22642264
int key_free;
2265-
long count;
2265+
zend_long count;
22662266

22672267
if(zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s|l", &key, &key_len,
22682268
&count)==FAILURE)
@@ -2875,7 +2875,7 @@ int redis_command_cmd(INTERNAL_FUNCTION_PARAMETERS, RedisSock *redis_sock,
28752875
void redis_getoption_handler(INTERNAL_FUNCTION_PARAMETERS,
28762876
RedisSock *redis_sock, redisCluster *c)
28772877
{
2878-
long option;
2878+
zend_long option;
28792879

28802880
if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "l", &option)
28812881
== FAILURE)
@@ -2906,7 +2906,8 @@ void redis_getoption_handler(INTERNAL_FUNCTION_PARAMETERS,
29062906
void redis_setoption_handler(INTERNAL_FUNCTION_PARAMETERS,
29072907
RedisSock *redis_sock, redisCluster *c)
29082908
{
2909-
long option, val_long;
2909+
zend_long option;
2910+
long val_long;
29102911
char *val_str;
29112912
size_t val_len;
29122913
struct timeval read_tv;

‎redis_commands.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@
1111
};
1212
int gettimeofday(struct timeval *tv, struct timezone *tz);
1313
# endif
14-
# if defined(HAVE_USLEEP)
15-
int usleep(unsigned int useconds);
16-
# endif
1714
#endif
1815

1916
#include "common.h"

‎tests/RedisTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1920,7 +1920,7 @@ public function testBRpopLpush() {
19201920

19211921
public function testZAddFirstArg() {
19221922

1923-
$this->redis->del('key');
1923+
$this->redis->del('100');
19241924

19251925
$zsetName = 100; // not a string!
19261926
$this->assertTrue(1 === $this->redis->zAdd($zsetName, 0, 'val0'));

0 commit comments

Comments
 (0)