]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-5.6' into PHP-7.0
authorStanislav Malyshev <stas@php.net>
Sun, 2 Dec 2018 21:18:07 +0000 (13:18 -0800)
committerStanislav Malyshev <stas@php.net>
Sun, 2 Dec 2018 21:18:07 +0000 (13:18 -0800)
* PHP-5.6:
  Fix TSRM signature - php_stream_stat macro has it's own TSRM
  Regenerate certificates for openssl tests
  Improve test for bug77022


Trivial merge