com php-src: Merge branch 'PHP-5.4' into PHP-5.5: ext/session/session.c

Commit: f83a6c33b407603c346dc3b20ac031e7594d37e8 Author: Yasuo Ohgaki <yohgaki@php.net> Sat, 19 Jul 2014 09:53:04 +0900 Parents: 982342b057d6ef811367ff804751d0d901a529b7 e946de29d2f337f140780086b0ccefd13e2095ef Branches: PHP-5.5 Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=f83a6c33b407603c346dc3b20ac031e7594d37e8 Log: Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #66827 Session raises E_NOTICE when session name variable is array Bugs: https://bugs.php.net/66827 Changed paths: MM ext/session/session.c Diff: diff --cc ext/session/session.c index 7822ffe,7d145c3..eb14e07 --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -1422,11 -1327,18 +1422,18 @@@ PHPAPI const ps_serializer *_php_find_p } /* }}} */ - #define PPID2SID \ - convert_to_string((*ppid)); \ - PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid)) + static void ppid2sid(zval **ppid TSRMLS_DC) { + if (Z_TYPE_PP(ppid) != IS_STRING) { + PS(id) = NULL; + PS(send_cookie) = 1; + } else { + convert_to_string((*ppid)); + PS(id) = estrndup(Z_STRVAL_PP(ppid), Z_STRLEN_PP(ppid)); + PS(send_cookie) = 0; + } + } -static void php_session_reset_id(TSRMLS_D) /* {{{ */ +PHPAPI void php_session_reset_id(TSRMLS_D) /* {{{ */ { int module_number = PS(module_number);