com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/session/session.c
| From: | Anatol Belski | Date: | Wed, 26 Jul 2017 11:21:20 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: ext/session/session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-98814@lists.php.net to get a copy of this message | ||
Commit: 9ff48011593bb841fbc6c98878d4a177aa24b964
Author: Anatol Belski <ab@php.net> Wed, 26 Jul 2017 13:21:20 +0200
Parents: d3060a00d1b6c6e0cd5d5c54838dfd571317f1d7 eaf5c7cdd4267e4b31732500a464546a9eae5b88
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=9ff48011593bb841fbc6c98878d4a177aa24b964
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
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 f359c1f,fa392dd..2ae78bd
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@@ -94,17 -94,14 +94,20 @@@ zend_class_entry *php_session_update_ti
return FAILURE; \
}
+#define SESSION_CHECK_OUTPUT_STATE \
+ if (SG(headers_sent) && stage != ZEND_INI_STAGE_DEACTIVATE) { \
+ php_error_docref(NULL, E_WARNING, "Headers already sent. You cannot change the session
module's ini settings at this time"); \
+ return FAILURE; \
+ }
+
#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);
+static int php_session_send_cookie(void);
+static int 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) /* {{{ */
{