michael-grunder
94e064940c
Merge branch 'hotfix/debug_object'
2014-07-21 12:50:52 -07:00
michael-grunder
96374a9105
Implement DEBUG OBJECT
...
Addresses #342
2014-07-21 12:50:29 -07:00
michael-grunder
6d14bf5355
Merge branch 'hotfix/win32-fixes'
2014-07-06 10:59:37 -07:00
michael-grunder
fb10a14b7c
config.h shouldn't be in the repo
2014-07-06 10:59:21 -07:00
michael-grunder
7a80c10905
Remove duplicate pubsub test
2014-07-06 10:58:22 -07:00
Anatol Belski
e223916eb4
cleanup config.w32
2014-07-04 10:05:54 +02:00
Anatol Belski
cdd4557f01
fix unreferenced variable warnings
2014-07-01 16:59:41 +02:00
Anatol Belski
79efa8d791
fixes after the merge
2014-07-01 16:50:23 +02:00
Anatol Belski
4d2533706a
Merge remote-tracking branch 'vostok4/master'
...
Conflicts:
CREDITS
README.markdown
config.w32
library.c
library.h
package.xml
redis.c
redis_array.c
redis_array.h
redis_array_impl.c
redis_array_impl.h
tests/TestRedis.php
2014-07-01 16:45:09 +02:00
Anatol Belski
48138096da
reworked config.w32
2014-07-01 14:00:36 +02:00
Anatol Belski
3880c9eb9e
fix CREDITS for resource compilation to work
...
see also CREDITS in other exts for the correct format
2014-07-01 12:37:11 +02:00
Anatol Belski
6c377eee18
added redis array stuff to win part done some fixes to it
2014-07-01 12:19:01 +02:00
Anatol Belski
0303e1594b
C89 compat for session
2014-07-01 12:01:27 +02:00
Anatol Belski
3f9d0f7192
more C89 compat
2014-07-01 11:58:35 +02:00
Anatol Belski
7194e31fe9
fix stdint usage
2014-07-01 11:50:36 +02:00
Anatol Belski
1fdefc2755
atoll vs _atoi64
2014-07-01 11:45:41 +02:00
Anatol Belski
00be281e1b
C89 compat
2014-07-01 11:41:55 +02:00
Anatol Belski
792a71da73
fixed prototype
2014-07-01 11:33:23 +02:00
Anatol Belski
603b20e763
fix random() vs php_rand() for portability
2014-07-01 11:29:30 +02:00
Anatol Belski
3aa3c2d2f1
split the igbinary stuff into a separate option
2014-07-01 11:28:57 +02:00
vostok4
566d673f83
Fix comments for C89 compatibility
2014-04-09 11:21:32 +02:00
vostok4
9c12c40a66
Merge nicolasff:b9a16b5ad5 in, fixing for Win32
...
Now we should be up to master with upstream for an easier merge.
2014-04-09 11:14:45 +02:00
Remi Collet
b9a16b5ad5
revert previous, and better fix for memory corruption (STR_FREE available since 5.0)
2014-03-20 15:06:40 +01:00
Remi Collet
d74b0d27f3
Fix warning: 'klen' may be used uninitialized in this function
2014-03-20 13:56:49 +01:00
Remi Collet
47ddcf75fd
Fix ibrary.c:1541:9: warning: unused variable 'sz' + 'val8'
2014-03-20 13:56:11 +01:00
Remi Collet
7634db4283
Fix: library.c:743:78: warning: unused variable 'p2' (PLEASE CHECK)
2014-03-20 13:54:53 +01:00
Remi Collet
8805b133b9
redis.c:7022:13: warning: 'keyword' may be used uninitialized in this function (mostly to make gcc happy)
2014-03-20 13:49:26 +01:00
Remi Collet
5520be1042
Fix memory corruption observed with PHP 5.6.0-dev
2014-03-20 13:48:04 +01:00
Remi Collet
a6aa390675
add tests to pecl package, fixed #332
2014-03-20 09:28:27 +01:00
michael-grunder
0ae592b55f
Merge branch 'hotfix/package_xml'
2014-03-19 09:40:32 -07:00
michael-grunder
f07110ba6a
Update package.xml for the next PECL update
2014-03-19 09:40:20 -07:00
michael-grunder
39b8f0c75b
Merge branch 'hotfix/credits'
2014-03-19 08:19:24 -07:00
michael-grunder
2fc8e78711
Add my email to CREDITS file
2014-03-19 08:19:11 -07:00
michael-grunder
9acd3760ee
Merge branch 'hotfix/tsrmls_cc-again'
2014-03-17 07:41:27 -07:00
michael-grunder
d4b5631b81
TSRMLS_DC, not TSRMLS_CC in definition
...
Addresses #444
2014-03-17 07:40:42 -07:00
michael-grunder
fd55a62c7b
Merge branch 'hotfix/2.2.5-pecl'
2014-03-15 10:44:54 -07:00
michael-grunder
94c369cfb6
Incorporate PECL and rpm changes to reflect 2.2.5
2014-03-15 10:41:14 -07:00
michael-grunder
a4edb02298
Merge branch 'release/2.2.5'
2014-03-15 10:21:15 -07:00
michael-grunder
1d47fc8813
Bump!
2014-03-15 10:20:55 -07:00
michael-grunder
6c37fa301d
Merge branch 'feature/pubsub_cmd' into develop
2014-03-15 10:14:41 -07:00
michael-grunder
c81a95413d
Merge branch 'hotfix/ra_autorehash' into develop
...
Conflicts:
redis_array.c
2014-03-11 09:14:26 -07:00
michael-grunder
b9460ccbba
Merge branch 'hotfix/ra_autorehash'
2014-03-11 09:12:51 -07:00
michael-grunder
f72a3177a3
Fix autorehashing in RedisArray
...
This commit fixes auto rehashing in RedisArray as well as fixes
a couple of memory leaks found along the way
Addresses #442 and #294
2014-03-10 13:18:19 -07:00
michael-grunder
6194d45dcc
Merge branch 'hotfix/ra_type_check' into develop
2014-03-09 11:06:58 -07:00
michael-grunder
d2cb145099
Merge branch 'hotfix/ra_type_check'
2014-03-09 11:06:46 -07:00
michael-grunder
0bf1971951
Data type check on redis array host info
...
RedisArray will segfault if you pass something other than strings
into your array of hosts. This is invalid input (needs strings here)
but it shouldn't crash php.
2014-03-09 11:05:45 -07:00
michael-grunder
e74ffe0366
Implemented BITPOS command
...
This commit introduces the new BITPOS redis command
http://redis.io/commands/bitpos
2014-03-03 06:23:38 -08:00
michael-grunder
8f006cba2d
Properly fix TRMLS_CC references :)
2014-02-26 06:59:11 -08:00
michael-grunder
e4d907c76a
Pass TSRMLS_CC macro
2014-02-25 05:57:54 -08:00
michael-grunder
d2bb49f5c0
Addreses #347
...
Merge branch 'feature/ra_connect_timeout' into develop
2014-02-23 14:47:39 -08:00
