com php-src: fix type in fix for #69085: ext/soap/soap.c
| From: | Remi Collet | Date: | Mon, 13 Apr 2015 12:40:05 +0000 |
| Subject: | com php-src: fix type in fix for #69085: ext/soap/soap.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-86167@lists.php.net to get a copy of this message | ||
Commit: c61ceef7796b3967dd5e270245d33ba72ba055ee
Author: Remi Collet <remi@php.net> Mon, 13 Apr 2015 14:39:11 +0200
Parents: 429f411eb39b1898a87efb0839f74f6e7c7d6ea1
Branches: PHP-5.5 PHP-5.6
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c61ceef7796b3967dd5e270245d33ba72ba055ee
Log:
fix type in fix for #69085
(cherry picked from commit 085e9ddc26f37ce556b8fd787044746e726264b2)
Bugs:
https://bugs.php.net/69085
Changed paths:
M ext/soap/soap.c
Diff:
diff --git a/ext/soap/soap.c b/ext/soap/soap.c
index 04fda5b..41ad45f 100644
--- a/ext/soap/soap.c
+++ b/ext/soap/soap.c
@@ -2570,7 +2570,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);
}
@@ -2605,7 +2605,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(¶ms[4]);
@@ -2650,7 +2650,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"));
}