1664 Commits

Author SHA1 Message Date
michael-grunder
ede43864a6 Fix version in source 3.1.1RC2 show 2017-01-16 10:39:56 -08:00
michael-grunder
6096b5e351 Ready 3.1.1.RC2 2017-01-16 10:00:51 -08:00
Pavlo Yatsukhnenko
12a333534f redis_sock_write refactoring
Check the number of bytes returned by `php_stream_write`.
Use SOCKET_WRITE_COMMAND macro.
2017-01-08 00:22:12 +02:00
Pavlo Yatsukhnenko
c90649a6d5 redis_boolean_response_impl refactoring 2017-01-04 23:32:29 +02:00
michael-grunder
6c1101f0e7 Test for calling connect multiple times on the same object 2017-01-02 17:54:01 -08:00
michael-grunder
335c05847c Use zend_list_close instead of zend_list_delete when reconnecting.
In php7 zend_list_close handles closing the connection and frees
resource structures but doesn't decrease refcount (and therefore
remove the element from the list).

This segfault could be triggered in php7 by simply doing this:

```php
$r = new Redis();
$r->connect('localhost', 6379);
$r->connect('localhost', 6379);
$r->ping(); // or any other command
```

What appears to have been happening here, is that phpredis would
delete any existing socket resource on a connect call to an already
existing object, but then the call to add_property_resource would
trigger the destructor of the socket (as the Zend library already
saw a "socket" property).

This would set redis_sock->stream->abstract (the actual socket) to
NULL, causing any subsequent communication to segfault or issue a
bus error.

Fixes #1076
2017-01-02 17:43:38 -08:00
michael-grunder
336a49b6d8 Merge branch 'develop' of github.com:phpredis/phpredis into develop 2016-12-28 12:30:09 -08:00
Michael Grunder
5fcd6dc819 Merge pull request #1078 from remicollet/issue-1056
Fix #1056 failed test on 32bits
2016-12-22 10:54:30 -08:00
Remi Collet
28be4a8d28 display integer size in test suite output 2016-12-22 11:55:21 +01:00
Remi Collet
52dbe95c29 fix rounding issue on arm 2016-12-22 11:54:54 +01:00
Remi Collet
f4cfc0ae19 Fix #1056 failed test on 32bits 2016-12-22 11:00:59 +01:00
michael-grunder
811bcc1275 Bamp 3.1.1RC1 3.1.1RC1 2016-12-22 00:12:04 -08:00
michael-grunder
61a7e48392 Use correct legacy definition for ZEND_MOD_END 2016-12-21 22:08:13 -08:00
michael-grunder
b7aea0187c Bamp 3.1.1-rc1 2016-12-21 16:30:18 -08:00
Remi Collet
ccd11e869b disply PHP version in test output 2016-12-21 09:59:25 +01:00
Remi Collet
2411ec9fa7 fix last -Wincompatible-pointer-types warning 2016-12-21 09:59:07 +01:00
Remi Collet
37c754a44a change redis_sock_read_scan_reply to use zend_long 2016-12-21 09:48:39 +01:00
Remi Collet
1435d4540a change redis_serialize to accept strlen_t 2016-12-21 09:28:34 +01:00
Remi Collet
c9825cc8c8 fix #1074 change redis_key_prefix to accept strlen_t 2016-12-21 09:13:36 +01:00
Pavlo Yatsukhnenko
04f1a40b98 Update contacts information 2016-12-20 23:13:12 +02:00
Pavlo Yatsukhnenko
8ed844e2ea fix 'this decimal constant is unsigned only in ISO C90' warning 2016-12-20 17:29:47 +02:00
Pavlo Yatsukhnenko
1fb6a24556 fix 'optional var not initialized' warnings 2016-12-20 16:26:21 +02:00
Pavlo Yatsukhnenko
5ee32baee6 PHP_FE_END + ZEND_MOD_END 2016-12-20 11:06:59 +02:00
michael-grunder
9eb9048154 Merge branch 'issue.1054' into develop 2016-12-19 14:25:53 -08:00
michael-grunder
2b91d58239 OCD spacing FTW 2016-12-19 14:14:41 -08:00
michael-grunder
f1d914e7f8 Even higher max version. 2016-12-19 14:01:08 -08:00
michael-grunder
9deafa1a38 Allow higher max php version 2016-12-19 12:05:55 -08:00
michael-grunder
721c272995 Use PHP_FE_END when available for RedisArray and RedisCluster 2016-12-19 11:46:19 -08:00
Michael Grunder
f820462c10 Merge pull request #1071 from remicollet/issue-moddep
Various minor
2016-12-19 11:43:14 -08:00
Remi Collet
e0273773c8 use PHP_FE_END when available 2016-12-19 20:29:03 +01:00
Remi Collet
5625b99819 add serializers info in phpinfo 2016-12-19 20:28:41 +01:00
Remi Collet
3baccddd11 add module dependency on igbinary 2016-12-19 20:28:22 +01:00
michael-grunder
85e0b9e7b2 Merge branch 'develop' into issue.1054 2016-12-18 21:26:55 -08:00
michael-grunder
d0b8011a9a Fix compiler warnings.
Changed zend hash function overrides to extern in the header, and
then defined them in library.c

Created a simple macro to suppress "set but not used" warnings,
which differ depending on build environment (php 5 vs php 7).
2016-12-18 21:06:38 -08:00
Pavlo Yatsukhnenko
a90bac2cff TravisCI: fix session test 2016-12-18 23:07:36 +02:00
Pavlo Yatsukhnenko
6ef3057ed7 Merge pull request #1068 from phpredis/issue.1060
Fix broken REDIS_DOUBLE_TO_STRING implementation
2016-12-17 23:25:05 +02:00
Pavlo Yatsukhnenko
84e3a9f171 Merge pull request #1063 from remicollet/issue-1062
fix #1062 restore 3.0.0 session behavior for PHP 7.1
2016-12-17 23:12:56 +02:00
Pavlo Yatsukhnenko
2e45db128f Merge pull request #1069 from yatsukhnenko/develop
TravisCI: session
2016-12-17 23:12:30 +02:00
Pavlo Yatsukhnenko
81d2cba557 TravisCI: session 2016-12-17 22:51:04 +02:00
Pavlo Yatsukhnenko
70c4d9bac2 Fix broken REDIS_DOUBLE_TO_STRING implementation 2016-12-17 10:43:07 +02:00
Remi Collet
18c7ab0076 fix #1062 restore 3.0.0 session behavior for PHP 7.1 2016-12-16 15:48:07 +01:00
Pavlo Yatsukhnenko
205c47dfa4 Merge pull request #1057 from yatsukhnenko/issue.1053
Fix segfault in testSerializerIGBinary
2016-12-16 11:23:13 +02:00
Pavlo Yatsukhnenko
43e5bf325a TravisCI: igbinary 2016-12-16 11:13:51 +02:00
Pavlo Yatsukhnenko
61c02e2985 Fix segfault in testSerializerIGBinary 2016-12-15 23:09:01 +02:00
Pavlo Yatsukhnenko
92a3a52942 release 3.1.0 3.1.0 2016-12-14 23:06:31 +02:00
Pavlo Yatsukhnenko
f192389368 Merge pull request #1051 from yatsukhnenko/develop
refactoring
2016-12-13 17:59:54 +02:00
Pavlo Yatsukhnenko
37d8bfde06 refactoring 2016-12-13 17:39:04 +02:00
Pavlo Yatsukhnenko
75ff50236e Merge pull request #1046 from yatsukhnenko/issue.1006
Issue #1006
2016-12-06 14:42:29 +02:00
Pavlo Yatsukhnenko
4377c97ee0 Issue #1006 2016-12-06 14:19:06 +02:00
Pavlo Yatsukhnenko
2c8ae9c0e6 Merge pull request #1044 from yatsukhnenko/develop
TravisCI: make clang happy with older php versions
2016-12-06 11:50:26 +02:00