]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Tue, 12 Jan 2016 09:24:21 +0000 (10:24 +0100)
committerAnatol Belski <ab@php.net>
Tue, 12 Jan 2016 09:24:21 +0000 (10:24 +0100)
* PHP-7.0:
  remove the unnecessary condition part
  fix possible buffer overrun in the errmsg string
  integrate tsrmls cache


Trivial merge