Merge master to support geo functionalities #1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Modified RedisArray to support IPv6 * Updated general test suite to take an override host * Updated make-cluster.sh to take an override host
Addresses phpredis#796
Incorporate PR phpredis#869 for php7
Apply changes from PR phpredis#862 for php7
replace emalloc+memcpy with estrndup
Conflicts: redis.c
Partial fix for phpredis#836 + additional checking params
charry-picked from 5778f03
Document raw command
Before this commit, building 32-bit with igbinary enabled in Visual Studio 2015 failed, since igbinary/igbinary.h wasn't in the include path (VS2015 x86 Native Tools command prompt) Pecls were installed in a pecl folder adjacent to (same level as) php-7.0.9-src folder. ``` C:\php-sdk\bin\phpsdk_setvars.bat buildconf configure --disable-all --enable-cgi --enable-session --enable-igbinary --enable-redis-igbinary ```
The fixes are limited to what are covered by tests/TestRedis.php
Command used to detect memory leaks (Anything mentioning redis):
```bash
USE_ZEND_ALLOC=0 ZEND_DONT_UNLOAD_MODULES=1 valgrind --leak-check=full \
php --php-ini php.ini tests/TestRedis.php
```
- USE_ZEND_ALLOC uses malloc/free/etc instead of Zend's custom allocator
- ZEND_DONT_UNLOAD_MODULES allows valgrind to print the file and line
numbers for a shared library (this extension)
- about valgrind: http://valgrind.org/docs/manual/quick-start.html
While the allocated memory would be cleaned up after the end of a request,
memory leaks might cause problems for long-running CLI scripts dealing
with hundreds of thousands of keys.
Cherry-picked from 670146b Conflicts: library.c
Reorder inclusion of common.h in redis_session.c. Fix a couple of unused variable warnings Potential fix for phpredis#929
If zval_(ptr_)dtor wasn't called on the converted values later, it would be a memory leak (lasting only until the request was over). Follow up to phpredis#918
Conflicts: .travis.yml
This reverts commit e64bd72.
…de-path-in-windows php7 - Properly add igbinary to the include path in windows
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
I merged master to current branch and resolved conflicts to keep it updated. Moreover, support geo functionalities.