com php-src: fix regressio introduce in 22e23e7cb8ca9aa134d138b5fed031af6c842b44: ext/session/session.c
| From: | Remi Collet | Date: | Wed, 16 Sep 2015 12:32:05 +0000 |
| Subject: | com php-src: fix regressio introduce in 22e23e7cb8ca9aa134d138b5fed031af6c842b44: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89042@lists.php.net to get a copy of this message | ||
Commit: 286b157a5fe8ac40051105ec7caa06cbf626c1dc
Author: Remi Collet <remi@php.net> Wed, 16 Sep 2015 14:32:05 +0200
Parents: 486848168cc5e8616669daf50069a4db21c1908b
Branches: PHP-7.0 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=286b157a5fe8ac40051105ec7caa06cbf626c1dc
Log:
fix regressio introduce in 22e23e7cb8ca9aa134d138b5fed031af6c842b44
Changed paths:
M ext/session/session.c
Diff:
diff --git a/ext/session/session.c b/ext/session/session.c
index 7e20698..570173a 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2102,6 +2102,9 @@ static PHP_FUNCTION(session_regenerate_id)
zend_string_release(data);
}
+ if (PS(use_cookies)) {
+ PS(send_cookie) = 1;
+ }
php_session_reset_id();
RETURN_TRUE;