From: Yasuo Ohgaki <yohgaki@php.net>
Date: Sat, 19 Jul 2014 00:53:04 +0000 (+0900)
Subject: Merge branch 'PHP-5.4' into PHP-5.5
X-Git-Tag: php-5.5.16RC1~39^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f83a6c33b407603c346dc3b20ac031e7594d37e8;p=php

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
---

f83a6c33b407603c346dc3b20ac031e7594d37e8
diff --cc ext/session/session.c
index 7822ffe59c,7d145c362b..eb14e07b65
--- 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);