com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/session/session.c
| From: | Yasuo Ohgaki | Date: | Mon, 18 Jan 2016 04:35:01 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-90679@lists.php.net to get a copy of this message | ||
Commit: d7fc3be99ea2df4405845a16d6cd5c80d9a4f79f
Author: Yasuo Ohgaki <yohgaki@php.net> Mon, 18 Jan 2016 13:35:01 +0900
Parents: 7554478a4c8c2844ffacb124256dfff777f0f44d ee1dd4949a77f95de4063f8feb2c10f67edcc341
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=d7fc3be99ea2df4405845a16d6cd5c80d9a4f79f
Log:
Merge branch 'PHP-5.6' into PHP-7.0
* PHP-5.6:
Use SUCCESS/FAILURE
Changed paths:
MM ext/session/session.c
Diff:
diff --cc ext/session/session.c
index 8427f85,c3ea950..fc91eda
--- 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++) {