]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0'
authorDmitry Stogov <dmitry@zend.com>
Wed, 7 Oct 2015 01:28:43 +0000 (04:28 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 7 Oct 2015 01:28:43 +0000 (04:28 +0300)
* PHP-7.0:
  Restored the original (php-5) behavior of convert_to_cstring(). It was broken in php7 by mistake and caused problems in ext/pgsql/tests/bug46408.phpt.


Trivial merge