From: Anatol Belski <ab@php.net>
Date: Tue, 12 Jan 2016 09:24:21 +0000 (+0100)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~617^2~73
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f3c6bd210801b3dd87b572472fb25cc483058951;p=php

Merge branch 'PHP-7.0'

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

f3c6bd210801b3dd87b572472fb25cc483058951