Skip to content

Merge master to support geo functionalities #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 76 commits into
base: php7
Choose a base branch
from
Open

Merge master to support geo functionalities #1

Changes from 1 commit
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
f974793
Add IPv6 support to Redis proper
michael-grunder Feb 12, 2016
4b2b65e
Add IPv6 support
michael-grunder Feb 12, 2016
2a4407f
More IPv6 additions
michael-grunder Feb 13, 2016
7eedd85
Allow sDiffStore to take one single array argument again
michael-grunder Mar 29, 2016
2a8fd3f
Fix bug of unclosed socket stream in RedisCluster's construction
CatKang Mar 25, 2016
12453fc
Dereference update for php7
michael-grunder Apr 12, 2016
cb0dc5c
Fix memory leak with php7 serialization
michael-grunder Apr 12, 2016
892f928
Initialize callbacks in ra_load_array as well
michael-grunder Apr 14, 2016
f4d0a7c
Don't double free z_ret
michael-grunder May 2, 2016
ad3c116
Use php7 zval_get_double method instead of converting value.
michael-grunder May 4, 2016
455fffa
Comment unused debug functions
michael-grunder Jun 2, 2016
254319d
Fix compiler warning
michael-grunder Jun 2, 2016
fd5819c
Merge branch 'php7-ipv6' into php7
michael-grunder Jun 2, 2016
ec8a37a
Incorporate shuffling seeds into php7 branch
michael-grunder Jun 2, 2016
0f97ab0
Fix bug where we were failing to initialize count
michael-grunder Jun 2, 2016
6447940
Bamp
michael-grunder Jun 3, 2016
eab23d7
Initial redis proper GEO* commands
michael-grunder Jun 9, 2016
f373865
Geo* unit tests
michael-grunder Jun 7, 2016
e615d19
Cluster geo commands and a generic so cluster and redis tests both work
michael-grunder Jun 8, 2016
0f53561
Unit tests, type correctness for php7
michael-grunder Jun 9, 2016
acd3fdb
Fix duplicate definition
michael-grunder Jun 10, 2016
adbd246
Skip GEO* tests if version < 3.2.0
michael-grunder Jun 10, 2016
66ffa32
Incorporate pull request #856 for php7
michael-grunder Jul 1, 2016
e915c2d
Remove double count
michael-grunder Jul 1, 2016
e79b3da
Fix incrby/decrby for large integers
michael-grunder Jul 1, 2016
dc78a6a
Incorporate PR #869 for php7
yatsukhnenko Jul 9, 2016
4233657
Merge pull request #878 from yatsukhnenko/php7
yatsukhnenko Jul 9, 2016
dd219ed
Apply changes from PR #862 for php7
yatsukhnenko Jul 10, 2016
480106b
Merge pull request #880 from yatsukhnenko/php7
yatsukhnenko Jul 10, 2016
7fc5360
This fix issue #834
yatsukhnenko Jul 6, 2016
fadc815
Merge pull request #882 from yatsukhnenko/php7
yatsukhnenko Jul 11, 2016
45e4670
support the client to Redis Cluster just having one master
andyli029 Jul 15, 2016
738587e
Redis::redis_sock_read_bulk_reply refactoring
yatsukhnenko Jul 16, 2016
b27c4dc
Fixes memory leaks in hmget/hgetall for RedisCluster
michael-grunder Jul 18, 2016
f984847
Fixed method call problem causes session handler to display two times
cdoco Jul 19, 2016
3cc473f
Minor cleanup
michael-grunder Jul 19, 2016
a30aab4
Remove unused spl_ce_RuntimeException extern
jmikola Jul 19, 2016
3008353
Make spl_ce_RuntimeException static
michael-grunder Jul 19, 2016
1febcbb
Update mkdeb.sh for PHP 7.0
arkhamvm Jul 20, 2016
25fac73
Update mkdeb-apache2.sh for PHP 7.0
arkhamvm Jul 20, 2016
9208bf6
Redis::close refactoring
yatsukhnenko Jul 6, 2016
989fdc3
Fix typo
michael-grunder Jul 20, 2016
a224ed3
hDel() returns LONG and is variadic
ProgerXP Jun 24, 2016
d9bd4e9
Allow for string based longs in zrangebyscore
michael-grunder Jul 29, 2016
78fff4d
Apply changes from PR #909
yatsukhnenko Jul 30, 2016
074995a
Merge pull request #910 from yatsukhnenko/php7
yatsukhnenko Jul 30, 2016
10f0b59
Apply changes from PR #911
yatsukhnenko Jul 30, 2016
b3193f1
Merge pull request #912 from yatsukhnenko/php7
yatsukhnenko Jul 30, 2016
e212dbb
Partial fix for #836 + additional checking params
yatsukhnenko Jul 20, 2016
f71a9a3
Merge pull request #914 from yatsukhnenko/php7
yatsukhnenko Jul 31, 2016
a06f423
memory leaks
yatsukhnenko Aug 3, 2016
65c4de2
Fix documentation typo
michael-grunder Aug 4, 2016
870224a
Fix formatting
michael-grunder Aug 4, 2016
72f21d0
More formatting :/
michael-grunder Aug 4, 2016
091725c
Travis CI
yatsukhnenko Aug 4, 2016
27dfe14
Merge branch 'php7' of github.com:phpredis/phpredis into php7
michael-grunder Aug 4, 2016
0e02799
Travis-CI widget
michael-grunder Aug 4, 2016
ebc4884
Add igbinary to the include path in windows
TysonAndre Aug 7, 2016
ac80c17
Fix various memory leaks in allocating strings.
TysonAndre Aug 7, 2016
75cae2f
REDIS_STREAM_CLOSE_MARK_FAILED macro
yatsukhnenko Aug 8, 2016
e64bd72
integer_length optimization
yatsukhnenko Aug 14, 2016
a86914f
Apply changes from PR #924
yatsukhnenko Aug 16, 2016
d5b7f85
Fix for linker error
michael-grunder Aug 19, 2016
3a98610
Fix other leaks; use zval_get_* where it makes code shorter.
TysonAndre Aug 19, 2016
1d8a393
pipeline/exec refactoring
yatsukhnenko Aug 22, 2016
e3ffc0a
ZEND_HASH_FOREACH_VAL macro
yatsukhnenko Sep 6, 2016
6c0f70e
remove unused variables
yatsukhnenko Sep 9, 2016
8d90b02
fix #942
ndxbn Sep 9, 2016
5cc64fe
Apply changes from PR #955
yatsukhnenko Sep 20, 2016
10b992b
Apply changes from PR #955
yatsukhnenko Sep 20, 2016
1cb4e07
Merge remote-tracking branch 'upstream/php7' into php7
yatsukhnenko Sep 30, 2016
ddfc55e
Apply changes from PR #966
yatsukhnenko Oct 1, 2016
a57d15e
Revert "integer_length optimization"
yatsukhnenko Oct 17, 2016
8a0ecbc
Merge pull request #917 from TysonAndre/add-igbinary-to-include-path-…
yatsukhnenko Nov 8, 2016
a5e0aa6
[WIP] Resovled merge conflicts
mahdi-hdi Nov 14, 2016
fcb0687
Fixed warning related to GEO command
mahdi-hdi Nov 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update mkdeb-apache2.sh for PHP 7.0
  • Loading branch information
@arkhamvm @michael-grunder
arkhamvm authored and michael-grunder committed Jul 20, 2016
commit 25fac739ea38b16b98b980b6d3d27847461dfd6d
8 changes: 4 additions & 4 deletions mkdeb-apache2.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,15 @@ mkdir -p debian/$DIR
cp debian.control debian/DEBIAN/control

UBUNTU=`uname -v | grep -ci ubuntu`
mkdir -p debian/etc/php5/apache2/conf.d/
mkdir -p debian/etc/php/7.0/apache2/conf.d/
if [ $UBUNTU = "0" ]; then
mkdir -p debian/etc/php5/cli/conf.d/
mkdir -p debian/etc/php/7.0/cli/conf.d/
fi

echo "extension=redis.so" >> debian/etc/php5/apache2/conf.d/redis.ini
echo "extension=redis.so" >> debian/etc/php/7.0/apache2/conf.d/redis.ini

if [ $UBUNTU = "0" ]; then
cp debian/etc/php5/apache2/conf.d/redis.ini debian/etc/php5/cli/conf.d/redis.ini
cp debian/etc/php/7.0/apache2/conf.d/redis.ini debian/etc/php/7.0/cli/conf.d/redis.ini
fi

cp modules/redis.so debian/$DIR
Expand Down