com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/session/session.c

From: Date: Wed, 26 Jul 2017 11:20:48 +0000
Subject: com php-src: Merge branch 'PHP-7.0' into PHP-7.1: ext/session/session.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-98817@lists.php.net to get a copy of this message
Commit: eaf5c7cdd4267e4b31732500a464546a9eae5b88 Author: Anatol Belski <ab@php.net> Wed, 26 Jul 2017 13:20:48 +0200 Parents: bb9ea4e88b14ab9ae51370c6265d8a88c8532937 bd00fe81cc4525b7d8e5c36a3844ee2254e5f69c Branches: PHP-7.1 PHP-7.2 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=eaf5c7cdd4267e4b31732500a464546a9eae5b88 Log: Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Fixed bug #74833, SID constant created with wrong module number Bugs: https://bugs.php.net/74833 Changed paths: MM ext/session/session.c Diff: diff --cc ext/session/session.c index d702d1b,daea59c..fa392dd --- a/ext/session/session.c +++ b/ext/session/session.c @@@ -97,8 -97,10 +97,11 @@@ zend_class_entry *php_session_update_ti #define APPLY_TRANS_SID (PS(use_trans_sid) && !PS(use_only_cookies)) static void php_session_send_cookie(void); +static void php_session_abort(void); + /* Initialized in MINIT, readonly otherwise. */ + static int my_module_number = 0; + /* Dispatched by RINIT and by php_session_destroy */ static inline void php_rinit_session_globals(void) /* {{{ */ {

« previous php.cvs (#98817) next »