Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Thu, 17 Nov 2016 10:34:32 +0000 (13:34 +0300)
committerDmitry Stogov <dmitry@zend.com>
Thu, 17 Nov 2016 10:34:32 +0000 (13:34 +0300)
* PHP-7.0:
  Prevent modification of immutable arrays (ext/mbstring/tests/bug26639.phpt failure with opcache.protect_memory=1)

1  2 
ext/mbstring/mbstring.c

Simple merge