diff options
| author | Anatol Belski <ab@php.net> | 2014-09-24 21:39:49 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-09-24 21:39:49 +0200 |
| commit | a2dd6069420c77b4f070ef10916be0d5c9afe84f (patch) | |
| tree | caa9ffe31be09ba030ae4cf7920aaae486af1725 /Zend/zend_operators.c | |
| parent | 70077d84e9817293f59454dc97d6aa3be89f9c7a (diff) | |
| parent | 6a09bdff6a9ec30f744fa12aeb2875a764fc34c5 (diff) | |
| download | php-git-a2dd6069420c77b4f070ef10916be0d5c9afe84f.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master: (31 commits)
Fixed C++ incompatibility
update the certificate used for the test, as it expired recently
Fixed immutable arrays support
Fix counting of "R:" references in serialize()
Remove dead code
Test use($this) being an error
Move list() condition into assign_znode
typo
NEWS
Fix bug #68074 Allow to use system cipher list instead of hardcoded value
Avoid double checks
the order of the blocks should be Core, then exts in alphabetical order
add missing NEWS entry for the phpdbg compilation fix
add NEWS entry for #68088
Make QM_ASSIGN, JMP_SET and CAST return IS_TMP_VAR.
Removed useless helper
Drop unused result argument
Fix ct binding for cuf/cufa functions
Fix detection of write to built-in function for references
Test use of string names with \ prefix
...
Diffstat (limited to 'Zend/zend_operators.c')
| -rw-r--r-- | Zend/zend_operators.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zend/zend_operators.c b/Zend/zend_operators.c index 567d18c4aa..f3e0680f9e 100644 --- a/Zend/zend_operators.c +++ b/Zend/zend_operators.c @@ -827,8 +827,6 @@ try_again: case IS_NULL: case IS_FALSE: return STR_EMPTY_ALLOC(); - case IS_STRING: - return zend_string_copy(Z_STR_P(op)); case IS_TRUE: return zend_string_init("1", 1, 0); case IS_RESOURCE: { @@ -868,6 +866,8 @@ try_again: case IS_REFERENCE: op = Z_REFVAL_P(op); goto try_again; + case IS_STRING: + return zend_string_copy(Z_STR_P(op)); EMPTY_SWITCH_DEFAULT_CASE() } return NULL; |