com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: Zend/zend_operators.c
| From: | Anatol Belski | Date: | Thu, 06 Feb 2014 22:17:09 +0000 |
| Subject: | com php-src: Merge remote-tracking branch 'origin/master' into str_size_and_int64: Zend/zend_operators.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-75929@lists.php.net to get a copy of this message | ||
Commit: 44772c2cb5e5e9569e196a3fa0ffabfcad439659
Author: Anatol Belski <ab@php.net> Thu, 6 Feb 2014 23:17:09 +0100
Parents: eeea68592f01071890bb4afa26d9ec7d006b6b1c 237c1bf7b56cf1a7e98675bbeeb507853fec1fd7
Branches: str_size_and_int64
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=44772c2cb5e5e9569e196a3fa0ffabfcad439659
Log:
Merge remote-tracking branch 'origin/master' into str_size_and_int64
Conflicts:
Zend/zend_operators.c
Changed paths:
MM Zend/zend_operators.c
Diff:
diff --cc Zend/zend_operators.c
index f36160b,f022909..6884942
--- a/Zend/zend_operators.c
+++ b/Zend/zend_operators.c
@@@ -1025,12 -1026,14 +1025,14 @@@ ZEND_API int pow_function(zval *result
ZEND_TRY_BINARY_OBJECT_OPERATION(ZEND_POW);
if (Z_TYPE_P(op1) == IS_ARRAY) {
- ZVAL_INT(op1, 0);
- ZVAL_LONG(result, 0);
++ ZVAL_INT(result, 0);
+ return SUCCESS;
} else {
zendi_convert_scalar_to_number(op1, op1_copy, result);
}
if (Z_TYPE_P(op2) == IS_ARRAY) {
- ZVAL_INT(op2, 0);
- ZVAL_LONG(result, 1L);
++ ZVAL_INT(result, 1L);
+ return SUCCESS;
} else {
zendi_convert_scalar_to_number(op2, op2_copy, result);
}