diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 00:15:20 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2017-09-13 00:15:20 +0300 |
| commit | 40d15cb03d4690f5925e58cc2180659c2c807b5c (patch) | |
| tree | ae81b6e7e121c5da2b1471f901774484b3785f67 | |
| parent | c2cf132ecd95182cec5ed6ba67de43302fea4e6d (diff) | |
| parent | 5f1d553e7ef52c7d35caa31bcefcf174fa454795 (diff) | |
| download | php-git-40d15cb03d4690f5925e58cc2180659c2c807b5c.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Revert "Properly update string type flags"
| -rw-r--r-- | Zend/zend_variables.c | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/Zend/zend_variables.c b/Zend/zend_variables.c index c54009dfa0..aed16f6600 100644 --- a/Zend/zend_variables.c +++ b/Zend/zend_variables.c @@ -167,13 +167,6 @@ ZEND_API void ZEND_FASTCALL _zval_copy_ctor_func(zval *zvalue ZEND_FILE_LINE_DC) { if (EXPECTED(Z_TYPE_P(zvalue) == IS_ARRAY)) { ZVAL_ARR(zvalue, zend_array_dup(Z_ARRVAL_P(zvalue))); - } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_STRING)) { - CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); - ZVAL_NEW_STR(zvalue, zend_string_dup(Z_STR_P(zvalue), 0)); - } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT)) { - CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); - Z_STR_P(zvalue) = zend_string_dup(Z_STR_P(zvalue), 0); - Z_TYPE_INFO_P(zvalue) = IS_CONSTANT_EX; } else if (EXPECTED(Z_TYPE_P(zvalue) == IS_STRING) || EXPECTED(Z_TYPE_P(zvalue) == IS_CONSTANT)) { CHECK_ZVAL_STRING_REL(Z_STR_P(zvalue)); |