Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use SUCCESS/FAILURE

diff --cc ext/session/session.c
index 8427f852bcfeedadb7a6670f21249a4b05890228,c3ea950908fd16722b9333e2271a0a09f2269846..fc91eda00b07ed85af3174a343f4a4b017e69046
--- 1/ext/session/session.c
--- 2/ext/session/session.c
+++ b/ext/session/session.c
@@@ -1114,9 -1117,9 +1114,9 @@@ static ps_serializer ps_serializers[MAX
        PS_SERIALIZER_ENTRY(php_binary)
  };
  
 -PHPAPI int php_session_register_serializer(const char *name, int (*encode)(PS_SERIALIZER_ENCODE_ARGS), int (*decode)(PS_SERIALIZER_DECODE_ARGS)) /* {{{ */
 +PHPAPI int php_session_register_serializer(const char *name, zend_string *(*encode)(PS_SERIALIZER_ENCODE_ARGS), int (*decode)(PS_SERIALIZER_DECODE_ARGS)) /* {{{ */
  {
-       int ret = -1;
+       int ret = FAILURE;
        int i;
  
        for (i = 0; i < MAX_SERIALIZERS; i++) {