From: Anatol Belski <ab@php.net>
Date: Wed, 26 Jul 2017 11:20:48 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.2.0beta2~35^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=eaf5c7cdd4267e4b31732500a464546a9eae5b88;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  Fixed bug #74833, SID constant created with wrong module number
---

eaf5c7cdd4267e4b31732500a464546a9eae5b88
diff --cc ext/session/session.c
index d702d1b159,daea59c4ff..fa392dd3bc
--- 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) /* {{{ */
  {