Merge branch 'PHP-7.0' into PHP-7.1

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

diff --cc ext/session/session.c
index d702d1b159c9e371c847a2cb1135402c37135b7e,daea59c4ff896b2f2d90cf370fb4d341c593edaa..fa392dd3bced9715f239ed406e20d9d6b6cc1f5c
--- 1/ext/session/session.c
--- 2/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) /* {{{ */
  {