Commit Graph

  • 586d826c4d Merge branch 'hotfix/echo_alias' into develop michael-grunder 2013-06-24 11:57:38 -07:00
  • de139e83de Merge branch 'hotfix/echo_alias' echo_alias michael-grunder 2013-06-24 11:57:28 -07:00
  • e47e18c4b2 Create an alias for echo, called sendEcho michael-grunder 2013-06-24 11:56:38 -07:00
  • e74e98e0d7 Add ZEND_ACC_CTOR and ZEND_ACC_DTOR for Reflection Axel Etcheverry 2013-06-24 15:59:29 +02:00
  • 2f795ed0b4 FIx C99 compliance Emmanuel Merali 2013-05-26 01:25:27 +03:00
  • 01f0930113 Easy resharding distributor Emmanuel Merali 2013-05-22 06:35:09 +03:00
  • d71ed8155d Easy resharding distributor Emmanuel Merali 2013-05-22 06:34:21 +03:00
  • 6b30539cd6 Easy resharding distributor Emmanuel Merali 2013-05-22 06:31:26 +03:00
  • f4acf122ea Easy resharding distributor Emmanuel Merali 2013-05-22 06:12:44 +03:00
  • bf912799e7 Merge branch 'hotfix/zcmd_inf_weights' into develop michael-grunder 2013-05-09 11:57:55 -07:00
  • 2d0f29bdaf Merge branch 'hotfix/zcmd_inf_weights' zcmd_inf_weights michael-grunder 2013-05-09 11:57:42 -07:00
  • 75ddd072a4 Add unit tests for -inf/inf/+inf WEIGHTS Addresses issue #336 michael-grunder 2013-05-09 11:55:43 -07:00
  • e9d5e21980 Support for '-inf', 'inf', and '+inf' for WEIGHTS michael-grunder 2013-05-09 11:03:43 -07:00
  • 77f466fa8e Merge branch 'hotfix/array-flush-commands' into develop Nicolas Favre-Felix 2013-05-02 20:00:53 +01:00
  • da0cd3f655 Merge branch 'hotfix/array-flush-commands' Nicolas Favre-Felix 2013-05-02 19:59:53 +01:00
  • f9ef6efc7f Add FLUSHALL to RedisArray Nicolas Favre-Felix 2013-05-02 19:59:27 +01:00
  • 5660e10c62 Add FLUSHDB to RedisArray Nicolas Favre-Felix 2013-05-02 19:57:49 +01:00
  • d748ab48d0 Merge branch 'develop' of github.com:nicolasff/phpredis into develop Nicolas Favre-Felix 2013-04-29 21:43:22 +01:00
  • 2071696d03 Add PECL package.xml Nicolas Favre-Felix 2013-04-29 21:42:42 +01:00
  • 942fa840be Add PECL package.xml Nicolas Favre-Felix 2013-04-29 21:42:42 +01:00
  • 14b905c1cd Merge branch 'hotfix/comment_error' into develop michael-grunder 2013-04-28 11:39:58 -07:00
  • f9b248b87c Merge branch 'hotfix/comment_error' comment_error michael-grunder 2013-04-28 11:39:48 -07:00
  • 4080dd9d0b Fix comment format michael-grunder 2013-04-28 11:39:34 -07:00
  • b4976b6684 Merge branch 'master' of github.com:nicolasff/phpredis michael-grunder 2013-04-28 11:11:22 -07:00
  • cf6840e0eb Merge branch 'release/2.2.3' into develop michael-grunder 2013-04-28 11:10:43 -07:00
  • f9f2dc0dbf Merge branch 'release/2.2.3' 2.2.3 michael-grunder 2013-04-28 11:10:32 -07:00
  • 3e6d5b60d6 Cutting a release for 2.2.3. Added myself as a maintainer in the header files michael-grunder 2013-04-28 11:09:58 -07:00
  • 5d1b3a4ddb Update README.markdown Yuki Matsukura 2013-04-28 05:16:01 +09:00
  • d775e313c2 Merge pull request #331 from matsubo/master Nicolas Favre-Felix 2013-04-27 14:04:43 -07:00
  • f858f615a7 Update README.markdown Yuki Matsukura 2013-04-28 05:16:01 +09:00
  • 578bdf08cd Merge branch 'hotfix/tsrmls_cc' into develop michael-grunder 2013-03-28 07:58:47 -07:00
  • 4c16a303ef Merge branch 'hotfix/tsrmls_cc' tsrmls_cc michael-grunder 2013-03-28 07:58:40 -07:00
  • 411100da9e Don't duplicate TSRMLS_CC michael-grunder 2013-03-28 07:56:54 -07:00
  • e914485313 Merge branch 'hotfix/inspection_methods' into develop michael-grunder 2013-03-27 11:21:02 -07:00
  • 7c52f3add1 Merge branch 'hotfix/inspection_methods' inspection_methods michael-grunder 2013-03-27 10:24:31 -07:00
  • ef792320e7 Introspection methods michael-grunder 2013-03-27 10:21:18 -07:00
  • 11a1195d8e Merge branch 'hotfix/php5.2_warnings' into develop michael-grunder 2013-03-20 09:08:56 -07:00
  • b2ffb7ac75 Merge branch 'hotfix/php5.2_warnings' php5.2_warnings michael-grunder 2013-03-20 09:08:36 -07:00
  • 8596eac45e Use another NULL for zend_is_callable_ex Given that PHP 5.2.X and PHP 5.3.X use a different signature for zend_is_callable_ex, and we're not using the error return (PHP 5.3.X) anyway, just pass in NULL. michael-grunder 2013-03-20 09:00:57 -07:00
  • 25a1593d73 Merge branch 'develop' of github.com:nicolasff/phpredis into develop michael-grunder 2013-03-16 11:55:09 -07:00
  • 22ebd714bc Merge branch 'hotfix/eval_alias' into develop michael-grunder 2013-03-16 11:54:07 -07:00
  • d287163de2 Merge branch 'hotfix/eval_alias' eval_alias michael-grunder 2013-03-16 11:53:55 -07:00
  • c39ecd52f3 Alias eval and evalsha michael-grunder 2013-03-16 11:48:51 -07:00
  • b2a57c1f9f Merge branch 'hotfix/serializer_leak' into develop michael-grunder 2013-03-16 11:40:36 -07:00
  • f3a3fcef75 Merge branch 'hotfix/serializer_leak' michael-grunder 2013-03-15 16:35:18 -07:00
  • a4627bb94b Fixes a memory leak, and possible undefined behavior if we have a serialization failure and just return the raw contents of a key. michael-grunder 2013-03-15 16:34:05 -07:00
  • 4fd6acda89 Merge branch 'feature/client_doc_fmt' into develop michael-grunder 2013-02-25 14:12:48 -08:00
  • 7deb21fe2d More formatting michael-grunder 2013-02-25 14:12:20 -08:00
  • b096f5771b Formatting fix michael-grunder 2013-02-25 14:10:53 -08:00
  • 5582166f77 Fix documentation for CLIENT command michael-grunder 2013-02-25 14:08:07 -08:00
  • 4f2aa60e25 Merge remote-tracking branch 'upstream/develop' into develop Emmanuel Merali 2013-02-25 04:06:13 +02:00
  • d6c29e4348 Merge branch 'hotfix/fix_return_values' into develop michael-grunder 2013-02-24 17:52:56 -08:00
  • 5e5fa7895f Merge branch 'hotfix/fix_return_values' michael-grunder 2013-02-24 17:52:39 -08:00
  • 703476ce01 Fix each place we're erroring out but return a value as the methods are int returns michael-grunder 2013-02-24 17:51:56 -08:00
  • 0816289454 Merge branch 'hotfix/add_retval_zipped_wreply' into develop michael-grunder 2013-02-24 16:47:57 -08:00
  • 117cc22d75 Merge branch 'hotfix/add_retval_zipped_wreply' michael-grunder 2013-02-24 16:47:40 -08:00
  • 9954974778 Return a proper value michael-grunder 2013-02-24 16:45:11 -08:00
  • e457d9813d Don't return a value from a void function michael-grunder 2013-02-24 16:32:40 -08:00
  • 1f3358b62c Added lazy_connect option to RedisArray Emmanuel Merali 2013-02-25 01:00:40 +02:00
  • ec74ab98df Merge remote-tracking branch 'upstream/develop' into develop Emmanuel Merali 2013-02-25 00:54:48 +02:00
  • acd3245456 Added lazy_connect option to RedisArray Emmanuel Merali 2013-02-25 00:38:47 +02:00
  • 4ae635fddf Merge remote-tracking branch 'upstream/master' Emmanuel Merali 2013-02-24 23:41:12 +02:00
  • 6d3c9990a5 Merged changes from @mobli Emmanuel Merali 2013-01-29 11:47:36 +02:00
  • a4784b4de7 Merge branch 'hotfix/issue-229' into develop Nicolas Favre-Felix 2013-02-17 16:32:08 +00:00
  • 51264b7834 Merge branch 'hotfix/issue-229' Nicolas Favre-Felix 2013-02-17 16:32:06 +00:00
  • 5953e8fe13 Merge branch 'rnamiki-master' into hotfix/issue-229 Nicolas Favre-Felix 2013-02-17 16:26:18 +00:00
  • fb7c7a8d2e Merge branch 'hotfix/fix-broken-delete-test' into develop Nicolas Favre-Felix 2013-02-17 16:21:20 +00:00
  • 16188394d4 Merge branch 'hotfix/fix-broken-delete-test' Nicolas Favre-Felix 2013-02-17 16:21:18 +00:00
  • 8b4ee3dda2 Fix broken test with unexpected result for delete Nicolas Favre-Felix 2013-02-17 16:20:44 +00:00
  • 48b3e6b8c5 Merge branch 'hotfix/ttl-response-type' into develop Nicolas Favre-Felix 2013-02-17 16:18:02 +00:00
  • 4548a25fc4 Merge branch 'hotfix/ttl-response-type' Nicolas Favre-Felix 2013-02-17 16:17:55 +00:00
  • 90bdf9e8fd Fix test for TTL return value Nicolas Favre-Felix 2013-02-17 16:17:25 +00:00
  • 4231d70b66 Merge branch 'master' of https://github.com/rnamiki/phpredis into rnamiki-master Nicolas Favre-Felix 2013-02-17 16:07:39 +00:00
  • e4842cdeef Merge branch 'hotfix/document-windows-build' into develop Nicolas Favre-Felix 2013-02-17 15:31:23 +00:00
  • 3e777b4365 Merge branch 'hotfix/document-windows-build' Nicolas Favre-Felix 2013-02-17 15:31:22 +00:00
  • df060ca2ce Link to instructions on how to build on Windows Nicolas Favre-Felix 2013-02-17 15:30:20 +00:00
  • c37a7d3610 Merge branch 'hotfix/document_session_on_unix_socket' into develop Nicolas 2013-02-17 13:38:15 +00:00
  • 7d1d7037b8 Merge branch 'hotfix/document_session_on_unix_socket' Nicolas 2013-02-17 13:38:13 +00:00
  • 507ba7c513 Document unix sockets with the session handler Nicolas 2013-02-17 13:37:22 +00:00
  • fde5a3c96c Merge branch 'hotfix/document_array_distributor' into develop Nicolas 2013-02-17 13:34:02 +00:00
  • 05b233bdca Merge branch 'hotfix/document_array_distributor' Nicolas 2013-02-17 13:28:53 +00:00
  • b6721c1292 Document and test custom key distribution function Nicolas 2013-02-17 13:28:00 +00:00
  • e1234f1772 Merge branch 'feature/client-commands' into develop michael-grunder 2013-02-16 17:58:55 -08:00
  • 9a5196ed2e CLIENT Commands This commit adds support for the CLIENT commands (list, getname, setname, kill). michael-grunder 2013-02-16 17:57:32 -08:00
  • 8e99b9dcb3 Merge branch 'hotfix/remove_debug' into develop michael-grunder 2013-02-15 18:01:35 -08:00
  • 804478e097 Merge branch 'hotfix/remove_debug' michael-grunder 2013-02-15 18:01:30 -08:00
  • 31174e8e77 Just removed a debug line michael-grunder 2013-02-15 18:01:11 -08:00
  • 55dd05356d Merge remote-tracking branch 'kotas/opt-read-timeout' michael-grunder 2013-02-11 12:42:49 -08:00
  • 85ee61d19b Add prefix support to SUBSCRIBE/PSUBSCRIBE michael-grunder 2012-10-17 14:40:24 -07:00
  • 242a16d50a Merge branch 'srandmember_count' michael-grunder 2013-02-04 13:22:29 -08:00
  • 71a002d7fe Pulling README.markdown from master michael-grunder 2013-02-04 13:18:22 -08:00
  • c1e7da4256 Fix markdown formatting michael-grunder 2013-02-04 13:13:00 -08:00
  • 87dddda2ab Update documentation to new format for our count argument michael-grunder 2013-02-04 13:10:48 -08:00
  • f702e88348 Merge remote-tracking branch 'origin/hmset_performance' michael-grunder 2013-02-04 13:01:07 -08:00
  • d4c7f64131 New select DB command to RedisArray - Added retry delay on reconnect Emmanuel Merali 2013-01-29 11:47:36 +02:00
  • 9ba000c54c Revert "Retry delay - selectDB on array" Emmanuel Merali 2013-01-29 11:40:06 +02:00
  • e0ee405fe9 Revert "New select DB command to RedisArray - Added retry delay on reconnect" Emmanuel Merali 2013-01-29 11:39:13 +02:00
  • e6fc44a9d8 Merge pull request #289 from goodsoft/patch-1 Michael Grunder 2013-01-25 09:43:00 -08:00
  • f85b332f91 Update debian.control goodsoft 2013-01-25 17:29:58 +02:00
  • b991385672 Merge pull request #269 from shtouff/debian Michael Grunder 2013-01-24 08:33:33 -08:00