diff options
| author | Anatol Belski <ab@php.net> | 2014-10-18 03:31:02 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-18 03:31:02 +0200 |
| commit | 9cbdf3e66a76895861b6f39e1b1ef5cc46d76654 (patch) | |
| tree | 42e8f228933a881ab4e3ca06a389227d8377006d /ext/soap/php_encoding.c | |
| parent | 7a6a3d923bfaac10a73e7ddf93eb5b7b7f2703e8 (diff) | |
| parent | fb85d0322d39d49f37e32df6f68c9769f2cce0e4 (diff) | |
| download | php-git-9cbdf3e66a76895861b6f39e1b1ef5cc46d76654.tar.gz | |
Merge remote-tracking branch 'origin/master' into native-tls
* origin/master:
Fixed compilation
Optimized property access handlers. Removed EG(std_property_info).
Fixed bug #68199 (PDO::pgsqlGetNotify doesn't support NOTIFY payloads)
News entry for new curl constants
Diffstat (limited to 'ext/soap/php_encoding.c')
| -rw-r--r-- | ext/soap/php_encoding.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/soap/php_encoding.c b/ext/soap/php_encoding.c index d34587b85e..b12303ee0e 100644 --- a/ext/soap/php_encoding.c +++ b/ext/soap/php_encoding.c @@ -1203,7 +1203,8 @@ static zval* get_zval_property(zval* object, char* name, zval *rv TSRMLS_DC) property_info = zend_get_property_info(Z_OBJCE_P(object), Z_STR(member), 1 TSRMLS_CC); EG(scope) = old_scope; - if (property_info && zend_hash_exists(Z_OBJPROP_P(object), property_info->name)) { + if (property_info != ZEND_WRONG_PROPERTY_INFO && property_info && + zend_hash_exists(Z_OBJPROP_P(object), property_info->name)) { zval_ptr_dtor(&member); return data; } |