]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.4' into PHP-5.5
authorYasuo Ohgaki <yohgaki@php.net>
Sat, 19 Jul 2014 00:53:04 +0000 (09:53 +0900)
committerYasuo Ohgaki <yohgaki@php.net>
Sat, 19 Jul 2014 00:53:04 +0000 (09:53 +0900)
* PHP-5.4:
  Fixed bug #66827 Session raises E_NOTICE when session name variable is array

1  2 
ext/session/session.c

index 7822ffe59c875c9fcad9071c095204be5697f5bd,7d145c362b4f487694038badcd7bf1df52353cf1..eb14e07b65e6d01f3771867283e4c51f19d2823a
@@@ -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);