From b8b335c492f87178ab18ca34f928051bc1b65934 Mon Sep 17 00:00:00 2001 From: Dmitry Stogov Date: Wed, 7 Oct 2015 04:26:26 +0300 Subject: [PATCH] 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. --- Zend/zend_operators.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 2345e0b2d44..f2378d84b6f 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -492,7 +492,16 @@ try_again: ZEND_API void ZEND_FASTCALL _convert_to_cstring(zval *op ZEND_FILE_LINE_DC) /* {{{ */ { - _convert_to_string(op ZEND_FILE_LINE_CC); + double dval; + if (Z_TYPE_P(op) == IS_DOUBLE) { + zend_string *str; + double dval = Z_DVAL_P(op); + + str = zend_strpprintf(0, "%.*H", (int) EG(precision), dval); + ZVAL_NEW_STR(op, str); + } else { + _convert_to_string(op ZEND_FILE_LINE_CC); + } } /* }}} */