]> granicus.if.org Git - php/commit
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)
commitf3c6bd210801b3dd87b572472fb25cc483058951
tree22c87479c43d2cfbae08d4cc2018ac8376867b00
parent6579e484171889776d6cba23f8365758f2c8a4af
parentd8e2b8424fcb619e9dfafc0d7f059e023d0cf84e
Merge branch 'PHP-7.0'

* PHP-7.0:
  remove the unnecessary condition part
  fix possible buffer overrun in the errmsg string
  integrate tsrmls cache