summaryrefslogtreecommitdiff
path: root/ext/soap
diff options
context:
space:
mode:
authorRemi Collet <remi@php.net>2015-04-13 14:40:43 +0200
committerRemi Collet <remi@php.net>2015-04-13 14:40:43 +0200
commitdc0f2a5bad109ff356900def1a35385bd87ca54a (patch)
tree0ab9b51cc1d850944198b8677c392a0df6434e32 /ext/soap
parentdd50ec15386e4e3713d350fc25bd4da12870c418 (diff)
parentc61ceef7796b3967dd5e270245d33ba72ba055ee (diff)
downloadphp-git-dc0f2a5bad109ff356900def1a35385bd87ca54a.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: fix type in fix for #69085
Diffstat (limited to 'ext/soap')
-rw-r--r--ext/soap/soap.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 2a68944fd5..65699b1cfd 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2569,7 +2569,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
}
if (zend_hash_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace"), (void **) &trace) == SUCCESS &&
- (Z_LVAL_PP(trace) == IS_BOOL || Z_LVAL_PP(trace) == IS_LONG) && Z_LVAL_PP(trace) != 0) {
+ (Z_TYPE_PP(trace) == IS_BOOL || Z_TYPE_PP(trace) == IS_LONG) && Z_LVAL_PP(trace) != 0) {
add_property_stringl(this_ptr, "__last_request", buf, buf_size, 1);
}
@@ -2604,7 +2604,7 @@ static int do_request(zval *this_ptr, xmlDoc *request, char *location, char *act
}
ret = FALSE;
} else if (zend_hash_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace"), (void **) &trace) == SUCCESS &&
- (Z_LVAL_PP(trace) == IS_BOOL || Z_LVAL_PP(trace) == IS_LONG) && Z_LVAL_PP(trace) != 0) {
+ (Z_TYPE_PP(trace) == IS_BOOL || Z_TYPE_PP(trace) == IS_LONG) && Z_LVAL_PP(trace) != 0) {
add_property_stringl(this_ptr, "__last_response", Z_STRVAL_P(response), Z_STRLEN_P(response), 1);
}
zval_ptr_dtor(&params[4]);
@@ -2649,7 +2649,7 @@ static void do_soap_call(zval* this_ptr,
SOAP_CLIENT_BEGIN_CODE();
if (zend_hash_find(Z_OBJPROP_P(this_ptr), "trace", sizeof("trace"), (void **) &trace) == SUCCESS &&
- (Z_LVAL_PP(trace) == IS_BOOL || Z_LVAL_PP(trace) == IS_LONG) && Z_LVAL_PP(trace) != 0) {
+ (Z_TYPE_PP(trace) == IS_BOOL || Z_TYPE_PP(trace) == IS_LONG) && Z_LVAL_PP(trace) != 0) {
zend_hash_del(Z_OBJPROP_P(this_ptr), "__last_request", sizeof("__last_request"));
zend_hash_del(Z_OBJPROP_P(this_ptr), "__last_response", sizeof("__last_response"));
}