From: Yasuo Ohgaki <yohgaki@php.net>
Date: Mon, 18 Jan 2016 04:35:01 +0000 (+0900)
Subject: Merge branch 'PHP-5.6' into PHP-7.0
X-Git-Tag: php-7.0.3RC1~4
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d7fc3be99ea2df4405845a16d6cd5c80d9a4f79f;p=php

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  Use SUCCESS/FAILURE
---

d7fc3be99ea2df4405845a16d6cd5c80d9a4f79f
diff --cc ext/session/session.c
index 8427f852bc,c3ea950908..fc91eda00b
--- a/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++) {