]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' of git.php.net:/php-src into PHP-7.0
authorXinchen Hui <laruence@gmail.com>
Mon, 10 Apr 2017 03:49:44 +0000 (11:49 +0800)
committerXinchen Hui <laruence@gmail.com>
Mon, 10 Apr 2017 03:49:44 +0000 (11:49 +0800)
* 'PHP-7.0' of git.php.net:/php-src:
  Add NEWS
  Resolve bug #74188 (undefined statics raising with ?? operator)
  Fixed bug #72071: Prevent Max-Age from being negative
  Update NEWS with OpenSSL 1.1.0 support info
  Add OpenSSL 1.1.0 support to PHP 7.0


Trivial merge