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


Trivial merge